Commit Graph

209 Commits (3896f02d13ec3d4edfa187b9beda7e9fa366ea06)

Author SHA1 Message Date
haroon amjad 2032053cb7 Working on Health data 4 years ago
Haroon Amjad 59dac89118 updates 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
haroon amjad babb48b1db base app client changes 4 years ago
haroon amjad 03882c166c Translation & UI updates 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 4 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 4 years ago
haroon amjad 7264d03818 Family Files previleges fix 4 years ago
haroon amjad 2c4ff16f0c updates & fixes 4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 4 years ago
haroon amjad a4a2389a78 updates & fixes 4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
haroon amjad 304ba8afa4 bas app client fixes 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
haroon amjad 7467da7409 Imports organized 4 years ago
haroon amjad 5009e48f64 Updates in Ambulance Request & Covid test 4 years ago
hussam al-habibeh 981e78936e jira bugs 5 years ago
Sikander Saleem 3128810fb0 improvements. 5 years ago
Sultan Khan 724e0098fb bug fixes 5 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 5 years ago
Mohammad Aljammal 126fad61c0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
 Conflicts:
	lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal 53e4dfa99d Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!292
5 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 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
hussam al-habibeh f9b8191a5e jira bugs 5 years ago
haroon amjad 74671d2f25 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/order-preview-service.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
5 years ago
haroon amjad e0ebb922ed pharmacy fixes 5 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 5 years ago
mosazaid 74dd274502 working on pharmacy some fixes on cart page and request body 5 years ago
haroon amjad b9a12341d5 updates & fixes 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
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
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 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
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
enadhilal 60648d368f Merge branch 'development' into enad_pharmacy2 5 years ago
enadhilal 830e871e2c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
5 years ago
Mohammad Aljammal 0632af3fb5 Fix the Authentication Pharmacy 5 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 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
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 5 years ago
mosazaid 822defbd04 working on bmi calculator design and functionality 5 years ago
Sultan Khan c65983bfdb code merged 5 years ago
Mohammad Aljammal b63025a9b3 return CMC HHC 5 years ago
Mohammad Aljammal 634c874eee fix design issues 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 18dad434a0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/weather_service.dart
	lib/core/viewModels/dashboard_view_model.dart
	lib/main.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
	lib/pages/BookAppointment/Search.dart
	lib/pages/ErService/AmbulanceReq.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/pages/login/register.dart
	lib/pages/medical/allergies_page.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/doctor/doctor_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
	lib/uitl/location_util.dart
	lib/widgets/drawer/app_drawer_widget.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal 4d8f42b517 fix issues vital sign issue 5 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 5 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 5 years ago
Mohammad Aljammal aa89a05f1d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	ios/Flutter/.last_build_id
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/medical/prescriptions_service.dart
	lib/core/viewModels/project_view_model.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/BookAppointment/BookConfirm.dart
	lib/pages/BookAppointment/DoctorProfile.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/MyAppointments/models/ArrivedButtons.dart
	lib/pages/MyAppointments/widgets/AppointmentActions.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/feedback/send_feedback_page.dart
	lib/pages/insurance/insurance_approval_screen.dart
	lib/pages/insurance/insurance_card_screen.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/pages/medical/labs/laboratory_result_page.dart
	lib/pages/medical/labs/labs_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/patient_sick_leave_page.dart
	lib/pages/medical/prescriptions/prescription_details_page.dart
	lib/pages/medical/prescriptions/prescription_items_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/pages/medical/radiology/radiology_home_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/pages/medical/reports/reports_page.dart
	lib/pages/pharmacies/pharmacies_list_screen.dart
	lib/pages/settings/profile_setting.dart
	lib/services/authentication/auth_provider.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/floatingActionButton.dart
	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
	lib/widgets/data_display/medical/doctor_card.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 5 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 5 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Zohaib Kambrani 67f4b4e167 iOS Geofence in progress 5 years ago
Sultan Khan 2c50402aa8 language issue fixed 5 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 5 years ago
Mohammad Aljammal 9cec304712 Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes

See merge request Cloud_Solution/diplomatic-quarter!168
5 years ago
Sultan Khan 21ccf1ef86 bug fixes 5 years ago
Mohammad Aljammal 4d203c8a5b fix LabResult 5 years ago
enadhilal c22ca4e29e Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
enadhilal 888a74fb9b add these pages
​Product Tile Component
Product Detail Page
​Wishlist Page
​Reviews Page
Brands Page + Search
5 years ago
Mohammad Aljammal 459ba828d9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/vital_sign/vital_sign_item.dart
	lib/routes.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
5 years ago
mosazaid 4c9a1862d2 make pharmacy home page load data even without login, and some mini changes 5 years ago
umasoodch b5413d1749 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan f5b7d35f23 bug fixes 5 years ago
haroon amjad 7edb0c8009 Doctor rating dialog revamped 5 years ago
Zohaib Kambrani 1155466d19 Packages and Offer Slider at home 5 years ago
mosazaid 98f660e29b Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
mosazaid 4e5d6a9a00 finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished 5 years ago
haroon amjad 82e23efd32 working on ereferral 5 years ago
umasoodch 0431eb1ac8 Merge branch 'master' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago
haroon amjad 6846a8501a Merge branch 'master' 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
Elham Rababah 68e4b92717 Address Added Successfully 5 years ago
Zohaib Kambrani 27182ee8db no message 5 years ago
Elham Rababah ed56476d81 second step from location fixes 5 years ago
haroon amjad 97b8aeeff5 Version Control finished 5 years ago
Sultan Khan 340b9770c8 login 5 years ago
Mohammad Aljammal a556e8c1f8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/config.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
5 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 5 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 5 years ago
Sultan Khan 8d499704dc family file changes 5 years ago
Mohammad Aljammal 0d098def04 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
 Conflicts:
	assets/app_icons/config.json
	assets/app_icons/fonts/DQIcons.ttf
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/d_q_icons_icons.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/uitl/utils.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
5 years ago