Commit Graph

448 Commits (090556f4d1f73b036bfd6f63193bf8eb81059d44)

Author SHA1 Message Date
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 3 years ago
Mohammad Aljammal 1607aecb4a Merge branch 'pharmacy-Fatima' into 'development'
fixed an issue in recommended page

See merge request Cloud_Solution/diplomatic-quarter!304
4 years ago
Sultan Khan 724e0098fb bug fixes 4 years ago
Fatimah Alshammari 265d13b970 fixed an issue in recommended page 4 years ago
Mohammad Aljammal e04421079e Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!301
4 years ago
Elham Rababah 5dd2e9986e PAP-559: fix hospital_service 4 years ago
Mohammad Aljammal 0a4f17dc88 Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!298
4 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 4 years ago
Fatimah Alshammari 235fdfba54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 4 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 4 years ago
Sultan Khan d4c3b03a5f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 1b770420be bug fixes 4 years ago
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 4 years ago
mosazaid e5474b3062 fix perscription pages bugs 4 years ago
Mohammad Aljammal 126fad61c0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
 Conflicts:
	lib/core/service/client/base_app_client.dart
4 years ago
Mohammad Aljammal 53e4dfa99d Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!292
4 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 4 years ago
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
4 years ago
hussam al-habibeh f9b8191a5e jira bugs 4 years ago
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 4 years ago
haroon amjad 454957ebba Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
4 years ago
Sultan Khan 616212828d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 66acce3b40 ancillary order pages added 4 years ago
haroon amjad db0fcd51cc pharmacy updates 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
haroon amjad e0ebb922ed pharmacy fixes 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
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
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 50a45528d1 Merge branch 'pharmacy-bug-fixes' into 'development'
bug-fixes

See merge request Cloud_Solution/diplomatic-quarter!276
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
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
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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
mosazaid c64769e422 Merge branch 'development' into pharmacy-payment-feature 4 years ago
mosazaid f3cdd08857 adding fharmacy payment feature 4 years ago