devmirza121
a131f24952
Merge branch 'development_new_design_2.0' into mirza_home_page
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
# lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
# lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
# lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
# lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
# lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
devmirza121
1d1708bdcc
Health Calculator 4.0
4 years ago
haroon amjad
75989bdc01
Health Calculators translations
4 years ago
haroon amjad
ea745f1b9f
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad
efe8dea9a9
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!489
4 years ago
haroon amjad
502c7fd3de
Offers & discounts UI updating
4 years ago
devmirza121
6225f2468d
Health Calculator 3.0
4 years ago
Fatimah Alshammari
ca11fe3134
fix issues
4 years ago
haroon amjad
894cc0e336
Updates & fixes
4 years ago
haroon amjad
be771917f0
pharmacy fixes
4 years ago
Fatimah Alshammari
28678633e7
Merge branch 'development_new_design_2.0' into Fatima-New-Design
...
# Conflicts:
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari
78fc77159c
fix lakum issues
4 years ago
haroon amjad
8c99bba17b
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
e7f5fc8434
Blood donation fixes
4 years ago
haroon amjad
f029aaa1c6
Fixes & code optimizations
4 years ago
Mohammad Aljammal
f9e33e7212
Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
...
Zik new design 2.0
See merge request Cloud_Solution/diplomatic-quarter!467
4 years ago
Fatimah Alshammari
044f74865e
fixed issues
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
Fatimah Alshammari
e6378b7ada
fix issues
4 years ago
Zohaib Iqbal Kambrani
94a5cac27d
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
...
* development_new_design_2.0:
LiveCare Schedule fixes
improvements.
live care design 3.0
dialog ui changes in wallet & improvements.
LiveCare Schedule API fix
live care design 2.0
Health converters UI done
Health Calculators APIs updated
Translation updates
SessionID update
live care design 1.0
Updates & fixes
blood sugar dialog improvement.
# Conflicts: Rseloved
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Zohaib Iqbal Kambrani
9d71793e88
no message
4 years ago
Sikander Saleem
8c27773f7f
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
40c63ae53b
dialog ui changes in wallet & improvements.
4 years ago
haroon amjad
2a212149ed
Health converters UI done
4 years ago
haroon amjad
73822300f9
Health Calculators APIs updated
4 years ago
haroon amjad
7123ed34ab
Translation updates
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
30c6f1dedb
Updates
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
d409875741
Smartwatch updates
4 years ago
haroon amjad
1f077f71f8
no message
4 years ago
haroon amjad
5287260b85
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
4 years ago
Sultan Khan
c14f40dae2
register page
4 years ago
haroon amjad
983fb55747
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad
2032053cb7
Working on Health data
4 years ago
haroon amjad
3db4094585
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
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
haroon amjad
a710406317
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
# lib/pages/DrawerPages/family/my-family.dart
4 years ago
Mirza.Shafique
0ba4e9047b
design fixes 1.0
4 years ago
haroon amjad
ade3cb0899
File no & UI changes
4 years ago
haroon amjad
1dcfe44e96
Translations
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
43a672cc68
Updates & fixes
4 years ago
haroon amjad
5d44fff28d
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad
5f963b0327
Translation updates, CMC, HHC & RRT APIs updates
4 years ago
Mirza.Shafique
ab6f7b8915
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
4 years ago
Mirza.Shafique
eeaf7d9d2f
HMG Services Detail View
4 years ago
Sikander Saleem
f13871de9a
find us and prescription availability hospital location ui changes,
4 years ago
haroon amjad
90843252c3
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
# lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Fatimah Alshammari
9cf0794cf6
Fixed out of stuck items issues
4 years ago
haroon amjad
6d3ead24e1
localisation update
4 years ago
Mirza.Shafique
05a6860081
Merge branch 'mirza_home_page' into development_new_design_2.0
4 years ago
Mirza.Shafique
e1b79ef5c1
E-Refreal design
4 years ago
haroon amjad
e564cdc7e5
Updates & fixes
4 years ago
haroon amjad
6511ca8dc7
UI fixes & updates
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
Sikander Saleem
8f371f87d2
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Mirza.Shafique
dde16a13fe
General page in profile
4 years ago
haroon amjad
b475adb5c3
Updates & fixes
4 years ago
Mirza.Shafique
d664a216c6
Profile Page and Back Button Click
4 years ago
haroon amjad
cb220031dd
Updates & fixes
4 years ago
haroon amjad
587210ee58
UI fixes
4 years ago
haroon amjad
a819660536
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
4 years ago
haroon amjad
01ccd484f4
Calendar plugin changed
4 years ago
Sikander Saleem
08960867f7
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
55df00dcd4
h20 today ui (cont.)
4 years ago
Sikander Saleem
763c16ddd0
h2o setting ui redesigned.
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
Sultan Khan
821a9b5ade
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
4 years ago
Sultan Khan
2c1d7c511e
family file changes
4 years ago
haroon amjad
230d87c473
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
4 years ago
haroon amjad
01ca8b8f84
updates & fixes
4 years ago
Sikander Saleem
8b49eed6ae
hospital text replaced with branch
4 years ago
Elham Rababh
3dc28d318a
fix bugs on wish list
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
Sikander Saleem
6099738a5c
improvements
4 years ago
Haroon Amjad
19edcc210e
Rate appointment UI implemented
4 years ago
haroon amjad
89e1aa70c0
updates
4 years ago
Sikander Saleem
df32ae0142
lab order clinic/hospital name, prescription reminder ui, prescription availibility
4 years ago
Haroon Amjad
062ca5c11c
EReferral fixes
4 years ago
Haroon Amjad
abcb71e86e
Invoice details UI revamped
4 years ago
hussam al-habibeh
dbf7ebf287
fix most viewed & best sellers moduls
4 years ago
haroon amjad
0955a22616
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
fa8c739b2c
updates & fixes
4 years ago
haroon amjad
46d800c0c6
UI updates & fixes
4 years ago
Mirza.Shafique
ef8006efd8
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
# lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
# lib/pages/Covid-DriveThru/covid-payment-alert.dart
# lib/pages/Covid-DriveThru/covid-payment-details.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
4 years ago
Mirza.Shafique
5b330b2a25
Covid New Design
4 years ago
haroon amjad
5c64ce4795
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/MyAppointments/SchedulePage.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan
c54146b3ba
sechedule fix
4 years ago
haroon amjad
f55fbd1cc2
UI fixes
4 years ago
haroon amjad
4b1a2d4f3d
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/pages/ContactUs/findus/hospitrals_page.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
4 years ago
haroon amjad
a075d53dd5
UI updates & fixes
4 years ago
Sikander Saleem
7b8093b7ba
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
c1b23b7c2a
improvements
4 years ago
Mirza.Shafique
e24eaa791b
Merge branch 'mirza_home_page' into development_new_design_2.0
4 years ago
Mirza.Shafique
5b47aaac6f
icon and find us distance
4 years ago
haroon amjad
728c22cc68
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/insurance/insurance_approval_screen.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem
e37781c3a6
insurance approval screen and detail screen ui changes.
4 years ago
haroon amjad
92bfe27a6e
updates & 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
1200dbeb70
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
c050633671
SignalR Updates
4 years ago
Sultan Khan
f9f5a886a9
VITAL SIGN FIXED
4 years ago
haroon amjad
0a90791aca
Push notification fixes
4 years ago
haroon amjad
b1128be94f
Updates & fixes
4 years ago
haroon amjad
e5a636b704
Covid Test changes
4 years ago
haroon amjad
e8bb4e962c
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
4 years ago
Mirza.Shafique
717c7b3be4
Lab results designs enhancements
4 years ago
Fatimah Alshammari
bcfbca98a1
fixed arabic version
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
0fe4a21388
updates & fixes
4 years ago
haroon amjad
2d7c7239c5
Health Converters fixes
4 years ago
haroon amjad
f795ba24c5
updates & fixes
4 years ago
haroon amjad
f33272f8d9
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
ec646a7039
My Invoice fixes, Prescription page fixes
4 years ago
Mirza.Shafique
b3f3558eac
CMC 1.2
4 years ago
Mirza.Shafique
82a1d410db
Merge branch 'development_new_design_2.0' into mirza_home_page
...
# Conflicts:
# lib/pages/landing/widgets/logged_slider_view.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan
2019e804f0
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
169aafa26b
hmc services design fixed
4 years ago
Mirza.Shafique
831780555c
CMC 1.0
4 years ago
haroon amjad
3bb0a8b85b
Apple Pay finalized, Translation issues fixed, other updates
4 years ago
haroon amjad
ebcc2559ce
Ask doctor issue resolved, Translation & font family issues resolved
4 years ago
haroon amjad
25fb5decc0
Ask Doctor page fixes
4 years ago
Sultan Khan
671c432cd7
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
0086875d0d
Design Updated for tracker
4 years ago
Sikander Saleem
120e6c166d
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
c84707ba3f
monthly report request & sick leaves ui redesigned.
4 years ago
haroon amjad
9ffe064a3b
updates & fixes
4 years ago
Sikander Saleem
d1b7c94d6e
improvement.
4 years ago
Sikander Saleem
d9c1b8b8ea
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/main.dart
# lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
# lib/pages/medical/eye/EyeMeasurementsPage.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
4 years ago
haroon amjad
4469ae1209
updates & fixes
4 years ago
Sikander Saleem
fab051f9e7
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal
55f9bbcba4
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!379
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
5 years ago
Mirza.Shafique
590ea48ea9
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/MyAppointments/SchedulePage.dart
5 years ago
Mirza.Shafique
e1e3741abf
Event Reminder
5 years ago
Zohaib Iqbal Kambrani
d9672c47a0
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
BUG FIXES
fix issues PAP-910,PAP-911
fix bugs pharmacy
Dental procedures implemented
Revert "Merge branch 'foote_in_all_pages' into 'development'"
fixed products issues
calendar events changes
Covid passport CR implemented in Covid test flow
doctor schedule
Covid certificate passport CR implemented
Covid Lab result generate certificate implemented
return bottom sheet inside appointments list
fix issues related to footer
remove unused code
remove footer from pharmacy pages
first step from add footer for all pages
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
9cf9e297cf
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
...
# Conflicts:
# lib/pages/MyAppointments/AppointmentDetails.dart
5 years ago
haroon amjad
4560037f97
updates
5 years ago
Fatimah Alshammari
f09cdd944d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari
827d8733a1
fixed shopping cart issue
5 years ago
Sikander Saleem
402cf5936a
improvement.
5 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
5 years ago
Sultan Khan
1726f8cc11
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
d1fc4751ad
BUG FIXES
5 years ago
Zohaib Iqbal Kambrani
d1c99d1d82
ER Average waiting time label applied
5 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
5 years ago
Mirza.Shafique
089ad0d321
Booking appointment 1.3
5 years ago
haroon amjad
e9c26ee85f
Dental procedures implemented
5 years ago
Sikander Saleem
ca363adee2
merge & improvements
5 years ago
Sikander Saleem
6191377914
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/pages/login/login.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
5 years ago
Sultan Khan
b116079843
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Mirza.Shafique
ad025f3d8e
Booking appointment 1.2
5 years ago
Sultan Khan
4325bd3448
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
5fe6a6c3dd
doctor schedule
5 years ago
Mirza.Shafique
d2b2b4063d
Booking appointment 1.1
5 years ago
haroon amjad
72dbdd2c2b
Merge branch 'development' into Haroon
5 years ago
haroon amjad
e96157c74a
Covid certificate passport CR implemented
5 years ago
Zohaib Iqbal Kambrani
d33432d238
Covid Drive-Thru Questions Screen
5 years ago
haroon amjad
73097d15de
Covid Lab result generate certificate implemented
5 years ago
Mirza.Shafique
bd1cf9bcc7
Merge branch 'development_new_design_2.0' into mirza_home_page
...
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
# lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mirza.Shafique
62631677ad
Booking appointment 1.0
5 years ago
Sikander Saleem
2ba91e54ab
merge-changes
5 years ago
Sikander Saleem
94ff5cff40
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
5f521556dc
Dental flow fixes
5 years ago
Sikander Saleem
288d64214e
improvements
5 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
5 years ago
Sikander Saleem
5ab9dd1761
Appointment screen Changes & improvements.
5 years ago
Sultan Khan
57d87dfc03
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
11ffed2ae3
bug fixes
5 years ago
haroon amjad
cbbca5ce86
Merge branch 'development' into Haroon
5 years ago
Sikander Saleem
ec6693c55e
improvement.
5 years ago
haroon amjad
0121337d1b
LiveCare Flow from book appointment flow implemented
5 years ago
Sikander Saleem
6c8f1c6185
merge improvement.
5 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
5 years ago
Sikander Saleem
b3fd1cb93d
lab result detail flow chart screen & improvement.
5 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
5 years ago
Fatimah Alshammari
34ccb132dc
fixed issues
5 years ago
haroon amjad
cbbef80bd5
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
eadba3f767
Working on livecare appointment booking page
5 years ago
Sikander Saleem
bb20d65b40
lab result detail screen.
5 years ago
hussam al-habibeh
a33a6b0b2f
push request after conflict resolve
5 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
5 years ago
haroon amjad
5c8e9f4e19
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!352
5 years ago
haroon amjad
2242b78116
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
5 years ago
Zohaib Iqbal Kambrani
f442cc251c
Pre Post Images Dental Doctor Profile
5 years ago
haroon amjad
a32501f3dc
My invoices implementation continued
5 years ago
Sikander Saleem
80c50e29bf
Merge branch 'login_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
5 years ago
Sikander Saleem
4db432b351
lab results working(cont.) & improvements
5 years ago
Mirza.Shafique
38465eaafb
Home page icons and drawer
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
Mirza.Shafique
06f877b8d4
Home page new design & drawer
5 years ago
Zohaib Iqbal Kambrani
bf303a7be0
RRT Implementation
5 years ago
Mirza.Shafique
99c6318410
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
2d62822536
Medical Profile Page improvements
5 years ago
Sikander Saleem
f482595d6b
merge improvements.
5 years ago
Mirza.Shafique
4ebf5f900b
improvements.
5 years ago
Mirza.Shafique
32e867421f
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/date_uitl.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Mirza.Shafique
bbaeec5b85
Medical Profile Complete
5 years ago
Sikander Saleem
f6ae7ed770
merge changes-4
5 years ago
Sikander Saleem
14561d0ac6
merge changes-1
5 years ago
Mirza.Shafique
3c438406b5
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
Mirza.Shafique
49bfa2e9a7
Home page 1.3
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
Sultan khan
ba32a37a17
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
RRT in progress
See merge request Cloud_Solution/diplomatic-quarter!339
5 years ago
Zohaib Iqbal Kambrani
4da163d186
RRT in progress in stage
5 years ago
Sikander Saleem
907d90b987
login ui and forgot password ui added.
5 years ago
Sultan Khan
ed20ba65b3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
23ca95b9b6
bug fixes
5 years ago
Haroon Amjad
47e521fe1d
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
Sultan Khan
6442ce178d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan khan
a67e320a8e
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!333
5 years ago
Sultan Khan
8766a69928
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
hussam al-habibeh
d5c76b5400
jira bugs
5 years ago
hussam al-habibeh
6dc0d89f61
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
lib/uitl/utils.dart
5 years ago
hussam al-habibeh
981e78936e
jira bugs
5 years ago
Zohaib Iqbal Kambrani
08e0ce52c8
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
fix bugs
5 years ago
Zohaib Iqbal Kambrani
4abdd9bde7
no message
5 years ago
Mohammad Aljammal
4ac6bf628b
Merge branch 'fix-bugs' into 'development'
...
fix bugs
See merge request Cloud_Solution/diplomatic-quarter!331
5 years ago
Zohaib Iqbal Kambrani
882d5f090a
Merge branch 'zik-analytics' into ZohaibIqbalKambrani
...
* zik-analytics:
no message
5 years ago
mosazaid
2e33c2b240
fix bugs
5 years ago
Mirza.Shafique
b0dfbef52a
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Mirza.Shafique
d37f225c1b
Home page 1.2
5 years ago
Sikander Saleem
3707b13986
login type ui & icons added.
5 years ago
Sultan Khan
446f86dbcf
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Elham Rababh
5d05b09345
PAP-712 : fixes on Blood sugar
5 years ago
Sultan Khan
c88bea4461
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9acb5b087d
bug fixes
5 years ago
Mirza.Shafique
090556f4d1
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
5dc88f51c3
Home Page 1.0
5 years ago
Sikander Saleem
8b2feb03ea
last login and login options ui.
5 years ago
Sultan khan
9196367da4
Merge branch 'bug_fix_mirza' into 'development'
...
Medical Profile Buttons Lock
See merge request Cloud_Solution/diplomatic-quarter!329
5 years ago
Sultan khan
f54b9a63aa
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!328
5 years ago
Mirza.Shafique
2fda47baf6
Medical Profile Buttons Lock
5 years ago
Zohaib Iqbal Kambrani
dbf525c484
no message
5 years ago
Haroon Amjad
213d104d57
Covid test procedure selection implemented
5 years ago
Sultan Khan
14ef096c32
changes and fixes
5 years ago
Mirza.Shafique
b31813770e
Check-In NFC done
5 years ago
Mirza.Shafique
fb0a67e5bd
PAP 828 and 792 issue fix
5 years ago
haroon amjad
7cf66934bc
Merge branch 'Haroon' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
haroon amjad
7b6270c67f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
Sultan khan
f048f5229b
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!321
5 years ago
Mirza.Shafique
58d5734f1a
Bug Fix: 873, 878 to 881
5 years ago
Sultan Khan
85e803651c
permission issue fixed
5 years ago
Sultan Khan
da2df9b348
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
bcabd81f88
BUG FIXES
5 years ago
Haroon Amjad
e13a13189c
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
865afd7761
fix bugs
5 years ago
Mohammad Aljammal
25d5105caf
Merge branch 'Apr-fixes' into 'development'
...
PAP-607: fix issue
See merge request Cloud_Solution/diplomatic-quarter!312
5 years ago
Elham Rababah
2a47564c37
PAP-607: fix issue
5 years ago
Fatimah Alshammari
2481e4c9ea
fixed categories issues and home page button
5 years ago
Sultan Khan
8c9c309abb
bug fixes
5 years ago
Zohaib Iqbal Kambrani
c7c96f913f
no message
5 years ago
haroon amjad
6b675acc94
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
5 years ago
haroon amjad
353a5157f2
fixes
5 years ago
Mohammad Aljammal
9a850d0ca3
fix advance payment
5 years ago
haroon amjad
f754e48034
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
haroon amjad
49c454b132
fixes
5 years ago
mosazaid
b623bd0dce
Merge branch 'development' into fix_bugs
5 years ago
mosazaid
e5474b3062
fix perscription pages bugs
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
9c1fdf96f4
Merge branch 'development' into Haroon
5 years ago
haroon amjad
accc39d972
jira bug fixes
5 years ago
Sultan Khan
60b1688bb4
chatbot
5 years ago
Sultan Khan
9bfd725e4f
bug fixes
5 years ago
Sultan Khan
0445011e53
bug fixes
5 years ago
haroon amjad
454957ebba
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
5 years ago
Sultan Khan
616212828d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
66acce3b40
ancillary order pages added
5 years ago
Zohaib Iqbal Kambrani
f410ce20ca
Packages and Offers in Progress
5 years ago
haroon amjad
ed3dba3eb3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
b9a12341d5
updates & fixes
5 years ago
Mohammad Aljammal
861dba9a94
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
ec401d4848
Done Ed online
5 years ago
Sultan Khan
a6196d3c30
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
b891c1bd80
theme issue
5 years ago
Fatimah Alshammari
747763c4be
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
5 years ago
Sultan Khan
1a35fe37b6
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
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
Zohaib Iqbal Kambrani
15ec3ec9b9
Translation Track Driver, enhancement, initial camera
5 years ago
Zohaib Iqbal Kambrani
63663f1b24
Track Delivery Driver Completed
5 years ago
Fatimah Alshammari
ac32ba998c
fixed order isuee
5 years ago
Mohammad Aljammal
e6da54c201
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
20ad10b9dc
Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
8899bdf460
Done Prescription Delivery Address
5 years ago
mosazaid
d02b74142a
Merge branch 'development' into fix-pharmacy
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
5 years ago
mosazaid
1a45f99606
some fixes on pharmacy
5 years ago
haroon amjad
5e8e3806d6
Covid Drive-Thru implemented
5 years ago
Sultan Khan
144ef52c70
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
b3e6c4efda
voice command changes
5 years ago
Mohammad Aljammal
0098345d05
add Prescription Delivery Address Page amd fix the Authentication Pharmacy
5 years ago
mosazaid
b70c7d7d05
fix pharmacy auth
5 years ago
Mohammad Aljammal
29f4e6acb6
Merge branch 'hmg-services-fixing' into 'development'
...
Hmg services fixing
See merge request Cloud_Solution/diplomatic-quarter!262
5 years ago
haroon amjad
b6c617888b
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
mosazaid
cbe422cbc6
Merge branch 'hmg-services-fixing' into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
0444b21101
Merge branch 'development' into hmg-services-fixing
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sikander Saleem
aef4c7bfac
H2O feature improvement
5 years ago
haroon amjad
3832cee1ad
Translation fixes
5 years ago
Sikander Saleem
3b4e791017
H2O feature improvement
5 years ago
mosazaid
822defbd04
working on bmi calculator design and functionality
5 years ago
Sultan Khan
3ac69692be
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Mohammad Aljammal
3e441c55b2
fix bottom nav bar
5 years ago
Mohammad Aljammal
9d8c1ddf63
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
484cca086e
fix my my Trackers
5 years ago
haroon amjad
ab158e14e9
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
7c538b350f
LiveCare Scheduling finalized, Appointments in ToDo list categorized
5 years ago
hussam al-habibeh
b767748315
health-converter fix
5 years ago
hussam al-habibeh
97919c217f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh
1ce0ef7b6c
health-converter fix
5 years ago
Mohammad Aljammal
db2376f50c
fix blood and weight on my trackers
5 years ago
Sultan Khan
ccd2fc5068
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
mosazaid
38d52b52c8
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
5 years ago
mosazaid
174534d8a5
fix Blood donation functionality and design
5 years ago
Mohammad Aljammal
405f67be1e
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!249
5 years ago
Fatimah Alshammari
7a516cae51
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
5 years ago
Mohammad Aljammal
f883e1bd78
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljammal
0b1014a91c
fix blood sugar service on my tracker
5 years ago
Fatimah Alshammari
0f22a50a5d
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
5 years ago
Zohaib Iqbal Kambrani
9a5daed5c3
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
re-design child vaccine and fix some funcrionalities
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Sultan Khan
c65983bfdb
code merged
5 years ago
Zohaib Iqbal Kambrani
bbd953ae43
Order Delivery Driver tracking [inprogress]
5 years ago
mosazaid
3a45239059
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
f5d478fd27
re-design child vaccine and fix some funcrionalities
5 years ago
Mohammad Aljammal
4457b5f109
add translation to ER service
5 years ago
Mohammad Aljammal
200334d8f8
Fix ER service
5 years ago
Elham Rababah
c9edb37a3c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
5 years ago
mosazaid
5bcc67b77d
Nearest Er fix design
5 years ago
Zohaib Iqbal Kambrani
e2bce87e34
resolve merge conflicts.
5 years ago
Zohaib Iqbal Kambrani
dc83b476d6
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts:
# android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
# ios/Flutter/.last_build_id
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal
634c874eee
fix design issues
5 years ago
Fatimah Alshammari
ba4003cb56
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/locator.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/profile/profile.dart
5 years ago
Fatimah Alshammari
52fa0f6f89
fixed orders
5 years ago
Mohammad Aljammal
de1b7cc1d0
fix merge issues
5 years ago
Mohammad Aljammal
3fb522e15f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
lib/core/model/pharmacies/order_model.dart
lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
lib/core/viewModels/pharmacyModule/order_model_view_model.dart
lib/locator.dart
lib/main.dart
lib/pages/landing/landing_page_pharmcy.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/cart-order-preview.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/pages/pharmacies/wishlist.dart
lib/pages/pharmacy/order/Order.dart
lib/pages/pharmacy/order/OrderDetails.dart
lib/pages/pharmacy/order/ProductReview.dart
lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
lib/pages/pharmacy/profile/profile.dart
lib/services/pharmacy_services/orderDetails_service.dart
lib/services/pharmacy_services/order_service.dart
lib/services/pharmacy_services/pharmacyAddress_service.dart
lib/services/pharmacy_services/wishList_service.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/borderedButton.dart
lib/widgets/others/app_scaffold_widget.dart
lib/widgets/pharmacy/product_tile.dart
5 years ago
Mohammad Aljammal
c82f01cd1a
fix merge issues
5 years ago
Mohammad Aljammal
16d1f667d4
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
...
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/pages/pharmacy/profile/profile.dart
lib/widgets/pharmacy/product_tile.dart
5 years ago
mosazaid
38d58ebaaf
Merge branch 'pharmacy' into pharmacy_mosa_branch
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
# lib/services/pharmacy_services/pharmacyAddress_service.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
298b4d6525
change color
5 years ago
Mohammad Aljammal
f77d2b497e
fix issues
5 years ago