Commit Graph

108 Commits (a1b4e1c8a3e1ca42d94fea89bacbae40e4039458)

Author SHA1 Message Date
haroon amjad 302e9dbadd Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Fatimah Alshammari c84d1cadad fix address issue 4 years ago
Fatimah Alshammari bc9fc5a878 fix issue 4 years ago
Fatimah Alshammari 9d9377d59f fix issues 4 years ago
haroon amjad b0ae08d6a5 updates & fixes 4 years ago
hussam al-habibeh 141e650276 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
Elham Rababh 34596163d1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
Fatimah Alshammari 7bbabd798a fix issue 4 years ago
Fatimah Alshammari e640f41c35 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacies/widgets/ProductOrderItem.dart
4 years ago
Fatimah Alshammari 12b20831df fix app bar 4 years ago
Elham Rababh 12e47aba82 fix as first step 4 years ago
haroon amjad 816dfe4a12 Pharmacy fixes 4 years ago
Fatimah Alshammari 2992ca4f70 fix translation 4 years ago
Fatimah Alshammari bd93395d0f fix order details issue 4 years ago
haroon amjad 5f0985adaa Updates 4 years ago
haroon amjad d0c96d245b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
Fatimah Alshammari 468d64a1e0 fix design issue 4 years ago
Fatimah Alshammari 998c1af0f7 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari ae3bb1bb2d fix issues 4 years ago
haroon amjad 61a406085b lakum fixes 4 years ago
haroon amjad 47b7b0db58 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
Fatimah Alshammari bdf3429502 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
4 years ago
haroon amjad 777d88be30 updates 4 years ago
Fatimah Alshammari 54ff9931cb fixed arrow issue order page 4 years ago
haroon amjad 79d99dd48a Pharmacy security updates applied 4 years ago
Fatimah Alshammari 3bfca80ab9 fixed issue 4 years ago
haroon amjad 4823919fcb Pharmacy fixes 4 years ago
Elham Rababh f88864efd4 fix calling missing APi 4 years ago
Elham Rababh 2c3c270c43 finish steps inside payment 4 years ago
Elham Rababh df9e58402d first step from update design 4 years ago
Elham Rababh f8883f5439 first step from fixing check out process 4 years ago
Fatimah Alshammari ca11fe3134 fix issues 4 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
hussam al-habibeh cb85085969 show bottom nav in pharmacy all pages 4 years ago
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
haroon amjad e82b8d4439 Lakum & other fixes 4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
haroon amjad 41822d2cf1 Merge branch 'development' into haroon-new-design 4 years ago
Fatimah Alshammari e494c9304d fixed issues 4 years ago
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
Elham Rababh 2526d6bc6f fix issue in cart page 4 years ago
Fatimah Alshammari 8baad999c5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/config/config.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/wishlist.dart
4 years ago
Mohammad Aljammal 0150bc4684 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/ProductCheckTypeWidget.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Elham Rababh 055b888ba2 fix address 4 years ago
Mohammad Aljammal 9e31d497ed fix wish list issue 4 years ago
hussam al-habibeh f3000d0ee3 My account design fix 4 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 4 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 4 years ago