devamirsaleemahmad
|
0e8c1a8b2f
|
Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/ToDoList/widgets/paymentDialog.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# pubspec.yaml
|
12 months ago |
 haroon amjad
|
dd0099236d
|
Insurance dialog added post registration
|
12 months ago |
|
devamirsaleemahmad
|
cbc38940ea
|
changes
|
12 months ago |
Sultan khan
|
391331f508
|
code update in progress
|
1 year ago |
|
Sultan khan
|
b45cbbcf29
|
updates
|
1 year ago |
|
haroon amjad
|
e64a91855f
|
fixes
|
1 year ago |
|
haroon amjad
|
7c68779324
|
Nphies integration
|
1 year ago |
|
Zohaib Iqbal Kambrani
|
35b129fb68
|
migrated project to latest flutter sdk
|
2 years ago |
|
Zohaib Iqbal Kambrani
|
e615ca1a16
|
no message
|
2 years ago |
haroon amjad
|
a918d409fb
|
updates & fixes
|
3 years ago |
|
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
3 years ago |
 Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
3 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
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
9d71793e88
|
no message
|
3 years ago |
|
Sikander Saleem
|
40c63ae53b
|
dialog ui changes in wallet & improvements.
|
3 years ago |
|
Sikander Saleem
|
4858f8883a
|
blood donation dialog change & improvements.
|
3 years ago |
|
Sikander Saleem
|
554b9558b1
|
add reminder & send mail button color change.
|
3 years ago |
|
haroon amjad
|
43a672cc68
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
3 years ago |
|
Sikander Saleem
|
a026fbf940
|
feedback status added.
|
3 years ago |
|
Sikander Saleem
|
1346eab593
|
h2o today page, prescription & schedule appointment improvements.
|
3 years ago |
Mirza.Shafique
|
06c5ee269b
|
Bug Fixes
|
3 years ago |
|
haroon amjad
|
bbcf22ddfa
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
|
3 years ago |
|
Sikander Saleem
|
8e27d8210a
|
prescription detail ui changes.
|
3 years ago |
|
haroon amjad
|
bf4709fef6
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/medical/prescriptions/prescription_details_page.dart
|
3 years ago |
|
Sikander Saleem
|
9d67704c67
|
prescription detail ui changes(cont).
|
3 years ago |
|
haroon amjad
|
7467da7409
|
Imports organized
|
3 years ago |
|
Mirza.Shafique
|
96b971ef01
|
CMC 1.6
|
3 years ago |
|
Mirza.Shafique
|
e890c80831
|
CMC 1.3
|
3 years ago |
Sultan Khan
|
0086875d0d
|
Design Updated for tracker
|
3 years ago |
|
haroon amjad
|
e96157c74a
|
Covid certificate passport CR implemented
|
3 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
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
10a147860c
|
no message
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
e4256d6874
|
RRT in progress (Service implementations)
|
3 years ago |
Mohammad Aljammal
|
8899bdf460
|
Done Prescription Delivery Address
|
4 years ago |
|
Mohammad Aljammal
|
b63025a9b3
|
return CMC HHC
|
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 |
Mohammad Aljammal
|
9c12e949e8
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
9c18c69d90
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
de1e352e98
|
fix charts and vital sign
|
4 years ago |
mosazaid
|
6ac8d67b83
|
finish address add/edit/delete/select
|
4 years ago |
 umasoodch
|
b5413d1749
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Elham Rababah
|
ea195ea9bf
|
Finish translate CMC HHC
|
4 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
|
4 years ago |
|
mosazaid
|
4e5d6a9a00
|
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
|
4 years ago |
|
Elham Rababah
|
05deaa6322
|
Address Added Successfully
|
4 years ago |
Mohammad Aljmma
|
e1f6ef5e5b
|
fix Prescriptions history
|
4 years ago |
|
Mohammad Aljammal
|
c01e6095f2
|
done my trackers
|
4 years ago |