mosazaid
|
dfeb70c892
|
Merge branch 'development' into pharmacy-payment-feature
# Conflicts:
# lib/pages/pharmacy/order/OrderDetails.dart
|
4 years ago |
|
mosazaid
|
0b2002d4dd
|
finish payment order
|
4 years ago |
Sultan Khan
|
1a35fe37b6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
e61c26b853
|
Auto SMS, Themes, Voice Command
|
4 years ago |
Fatimah Alshammari
|
c629fcb85c
|
fixed recommended products new design
|
4 years ago |
Mohammad Aljammal
|
6b1cdb56c6
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!274
|
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 |
|
haroon amjad
|
d8e11f7187
|
Merge branch 'development' into Haroon
|
4 years ago |
|
haroon amjad
|
deb0b40cfe
|
fixes
|
4 years ago |
|
Mohammad Aljammal
|
9dc00b2329
|
Merge branch 'pharmacy-payment-feature' into 'development'
Pharmacy payment feature
See merge request Cloud_Solution/diplomatic-quarter!273
|
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 |
Zohaib Iqbal Kambrani
|
15ec3ec9b9
|
Translation Track Driver, enhancement, initial camera
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
63663f1b24
|
Track Delivery Driver Completed
|
4 years ago |
|
Fatimah Alshammari
|
ac32ba998c
|
fixed order isuee
|
4 years ago |
|
Mohammad Aljammal
|
d84d60dc56
|
Merge branch 'pharmacy-bugs' into 'development'
pharmacy bugs fixed
See merge request Cloud_Solution/diplomatic-quarter!272
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
516df96e21
|
no message
|
4 years ago |
hussam al-habibeh
|
e050f87a64
|
pharmacy bugs
|
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 |
|
Mohammad Aljammal
|
a211248cfa
|
Merge branch 'fix-pharmacy' into 'development'
Fix pharmacy
See merge request Cloud_Solution/diplomatic-quarter!271
|
4 years ago |
|
mosazaid
|
125dd27a00
|
Merge branch 'development' into fix-pharmacy
|
4 years ago |
|
mosazaid
|
5d0a122689
|
fix bugs
|
4 years ago |
|
Mohammad Aljammal
|
30d525791d
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!268
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
2ec9331d2f
|
Merge branch 'fix-pharmacy' into 'development'
Fix pharmacy
See merge request Cloud_Solution/diplomatic-quarter!269
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
b9d043fd7c
|
Merge branch 'prescription_delivery' into 'development'
Done Prescription Delivery Address
See merge request Cloud_Solution/diplomatic-quarter!270
|
4 years ago |
|
Mohammad Aljammal
|
8899bdf460
|
Done Prescription Delivery Address
|
4 years ago |
|
mosazaid
|
d02b74142a
|
Merge branch 'development' into fix-pharmacy
# Conflicts:
# lib/core/service/client/base_app_client.dart
|
4 years ago |
|
mosazaid
|
1a45f99606
|
some fixes on pharmacy
|
4 years ago |
|
haroon amjad
|
5e8e3806d6
|
Covid Drive-Thru implemented
|
4 years ago |
|
Sultan Khan
|
3e947dda37
|
Merge branch 'sultan-patientapp' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
e20eed2f6e
|
voice command changes merged
|
4 years ago |
|
Sultan Khan
|
144ef52c70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
b3e6c4efda
|
voice command changes
|
4 years ago |
|
haroon amjad
|
ba10014b46
|
Merge branch 'development' into Haroon
|
4 years ago |
|
enadhilal
|
60648d368f
|
Merge branch 'development' into enad_pharmacy2
|
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 |
|
Mohammad Aljammal
|
4d950d3933
|
Merge branch 'prescription_delivery' into 'development'
Fix the Authentication Pharmacy
See merge request Cloud_Solution/diplomatic-quarter!267
|
4 years ago |
|
Mohammad Aljammal
|
0632af3fb5
|
Fix the Authentication Pharmacy
|
4 years ago |
|
Mohammad Aljammal
|
b8ded38dc2
|
Merge branch 'prescription_delivery' into 'development'
add Prescription Delivery Address Page and fix the Authentication Pharmacy
See merge request Cloud_Solution/diplomatic-quarter!266
|
4 years ago |
|
Mohammad Aljammal
|
0098345d05
|
add Prescription Delivery Address Page amd fix the Authentication Pharmacy
|
4 years ago |
|
haroon amjad
|
83cca264f1
|
Merge branch 'LamaHerbish' into Haroon
|
4 years ago |
HMG\Lama.Herbish
|
031be1ac56
|
fixes
|
4 years ago |
|
haroon amjad
|
0dc35f1270
|
Merge branch 'development' into Haroon
|
4 years ago |