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 |
|
haroon amjad
|
e0ebb922ed
|
pharmacy fixes
|
4 years ago |
Mohammad Aljammal
|
17fa2b5e20
|
Merge branch 'fix_order_checkout_payment' into 'development'
Fix order checkout payment
See merge request Cloud_Solution/diplomatic-quarter!283
|
4 years ago |
Zohaib Iqbal Kambrani
|
f410ce20ca
|
Packages and Offers in Progress
|
4 years ago |
mosazaid
|
ed1626f8ee
|
Merge branch 'development' into fix_order_checkout_payment
|
4 years ago |
|
mosazaid
|
74dd274502
|
working on pharmacy some fixes on cart page and request body
|
4 years ago |
|
haroon amjad
|
ed3dba3eb3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
haroon amjad
|
b9a12341d5
|
updates & fixes
|
4 years ago |
|
Mohammad Aljammal
|
4dcb70d7eb
|
Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!282
|
4 years ago |
|
Mohammad Aljammal
|
a0a217acc5
|
Merge branch 'ed_online' into 'development'
Done Ed online
See merge request Cloud_Solution/diplomatic-quarter!281
|
4 years ago |
hussam al-habibeh
|
a534b1415e
|
products filtering fix
|
4 years ago |
Mohammad Aljammal
|
861dba9a94
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
ec401d4848
|
Done Ed online
|
4 years ago |
|
Mohammad Aljammal
|
cacb6722b9
|
Merge branch 'pharmacy-bugs' into 'development'
daynimic listing
See merge request Cloud_Solution/diplomatic-quarter!279
|
4 years ago |
|
hussam al-habibeh
|
b39e88d9c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
|
4 years ago |
|
Mohammad Aljammal
|
95e8fdcacf
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!280
|
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 |
|
hussam al-habibeh
|
2723422bbf
|
daynimic listing
|
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 |
|
Zohaib Iqbal Kambrani
|
15ec3ec9b9
|
Translation Track Driver, enhancement, initial camera
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
63663f1b24
|
Track Delivery Driver Completed
|
4 years ago |