Sultan Khan
|
66acce3b40
|
ancillary order pages added
|
4 years ago |
|
Sultan Khan
|
a6196d3c30
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
b891c1bd80
|
theme issue
|
4 years ago |
Mohammad Aljammal
|
123b1de1a4
|
Merge branch 'pharmacy-bugs' into 'development'
hussam
See merge request Cloud_Solution/diplomatic-quarter!278
|
4 years ago |
|
Mohammad Aljammal
|
50a45528d1
|
Merge branch 'pharmacy-bug-fixes' into 'development'
bug-fixes
See merge request Cloud_Solution/diplomatic-quarter!276
|
4 years ago |
|
Mohammad Aljammal
|
4e47da0702
|
Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!277
|
4 years ago |
hussam al-habibeh
|
299a1bed25
|
hussam
|
4 years ago |
|
hussam al-habibeh
|
790fbbcf6c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
Conflicts:
lib/pages/pharmacy_categorise.dart
|
4 years ago |
|
hussam al-habibeh
|
3af37a6a5c
|
hussam
|
4 years ago |
Fatimah Alshammari
|
8624d695dc
|
fixed order details
|
4 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
|
4 years ago |
mosazaid
|
44287db553
|
bug-fixes
|
4 years ago |
|
Mohammad Aljammal
|
576181a72e
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!251
|
4 years ago |
|
Sultan Khan
|
6f68cf5a15
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Mohammad Aljammal
|
ee231ed981
|
Merge branch 'pharmacy-payment-feature' into 'development'
Pharmacy payment feature
See merge request Cloud_Solution/diplomatic-quarter!275
|
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 |
|
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 |
|
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 |
|
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 |