 Sikander Saleem
|
f0bb94c422
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
Fatimah Alshammari
|
bcfbca98a1
|
fixed arabic version
|
3 years ago |
|
Fatimah Alshammari
|
8c0dca781c
|
fixed compare issues and arabic version
|
3 years ago |
Mirza.Shafique
|
96b971ef01
|
CMC 1.6
|
3 years ago |
|
Fatimah Alshammari
|
6d72be2a73
|
fixed cart order issues
|
3 years ago |
|
Fatimah Alshammari
|
827d8733a1
|
fixed shopping cart issue
|
3 years ago |
|
Fatimah Alshammari
|
b6981299d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Fatimah Alshammari
|
239ad530ce
|
fixed isuues
|
3 years ago |
Mohammad Aljammal
|
8abbb04f02
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!373
|
3 years ago |
|
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
3 years ago |
|
Fatimah Alshammari
|
72ba0c7c74
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
3 years ago |
|
Fatimah Alshammari
|
f3b545ff74
|
fixed products issues
|
3 years ago |
Elham Rababh
|
f85c359cf4
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
Conflicts:
lib/pages/landing/landing_page.dart
|
3 years ago |
|
Elham Rababh
|
69df61afb1
|
remove footer from pharmacy pages
|
3 years ago |
|
Fatimah Alshammari
|
0d3f6237ce
|
fixed issues
|
3 years ago |
|
Fatimah Alshammari
|
faa8a13778
|
fixed isuue-product details
|
4 years ago |
|
Fatimah Alshammari
|
265d13b970
|
fixed an issue in recommended page
|
4 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
|
4 years ago |
mosazaid
|
74dd274502
|
working on pharmacy some fixes on cart page and request body
|
4 years ago |
|
haroon amjad
|
b9a12341d5
|
updates & fixes
|
4 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
|
4 years ago |
|
Fatimah Alshammari
|
c629fcb85c
|
fixed recommended products new design
|
4 years ago |
|
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
4 years ago |
|
Fatimah Alshammari
|
e5829d8513
|
fix recommended for you
|
4 years ago |
|
mosazaid
|
c64769e422
|
Merge branch 'development' into pharmacy-payment-feature
|
4 years ago |
|
mosazaid
|
f3cdd08857
|
adding fharmacy payment feature
|
4 years ago |
enadhilal
|
0cb493d56c
|
Merge branch 'development' into enad_pharmacy2
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
|
4 years ago |
|
enadhilal
|
0c6fb67718
|
fixed issues
|
4 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
|
4 years ago |
|
Fatimah Alshammari
|
ac32ba998c
|
fixed order isuee
|
4 years ago |
hussam al-habibeh
|
8c58dced7d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
Conflicts:
lib/core/service/pharmacy_categorise_service.dart
lib/pages/final_products_page.dart
|
4 years ago |
|
hussam al-habibeh
|
1b76d9c192
|
pharmacy bugs fixed
|
4 years ago |
|
mosazaid
|
5d0a122689
|
fix bugs
|
4 years ago |
|
mosazaid
|
1a45f99606
|
some fixes on pharmacy
|
4 years ago |
|
enadhilal
|
830e871e2c
|
Merge branch 'development' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
|
4 years ago |
|
enadhilal
|
292e983614
|
fixing issues
|
4 years ago |
|
Fatimah Alshammari
|
ef8312f2b8
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/pharmacies/product_detail.dart
|
4 years ago |
|
Fatimah Alshammari
|
ce64da11e4
|
homepage and product details design
|
4 years ago |
|
Sikander Saleem
|
8f37fbf260
|
Qr icon added, notify me api added & improvements
|
4 years ago |
|
Fatimah Alshammari
|
7a516cae51
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
|
4 years ago |
|
Fatimah Alshammari
|
0f22a50a5d
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
|
4 years ago |
|
mosazaid
|
d2e1a323ce
|
simple fix
|
4 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
|
4 years ago |
|
Fatimah Alshammari
|
52fa0f6f89
|
fixed orders
|
4 years ago |
|
mosazaid
|
2843b1393e
|
some design enhancments
|
4 years ago |
Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
4 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
|
4 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
|
4 years ago |
|
enadhilal
|
10734d5994
|
connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
|
4 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
|
4 years ago |