Commit Graph

144 Commits (801a2578ab12ba7a1fbaf1d5dc92859770b4898a)

Author SHA1 Message Date
Aamir Muhammad 801a2578ab lottie & bottom sheet 4 months ago
Aamir Muhammad 5fd4aee7ea consumer on welcome & language & font 4 months ago
Aamir Muhammad dbfa3c7cee consumer on welcome & language & font 4 months ago
Aamir Muhammad 1282b5a415 consumer on welcome & language & font 4 months ago
Aamir Muhammad 6578baaf34 login using sms done 4 months ago
haroon amjad e748712954 Initial Commit 4 months ago
haroon amjad dc17576c26 Flutter version upgraded to 3.22.0 1 year ago
Sultan khan 8c46d2577d updated with assets 2 years ago
Sultan khan c96c151f44 null safety issue fixed. 2 years ago
devamirsaleemahmad 23b7d85911 changes 2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
devamirsaleemahmad 720c0ac6e9 changes & Deletion 2 years ago
Sultan khan 4d52f639aa Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/livecare/live_care_payment_page.dart
#	lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart
#	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
#	lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
2 years ago
Sultan khan 0c534cffae code update in progress 2 years ago
devamirsaleemahmad 2c9e51aef0 changes 2 years ago
devamirsaleemahmad 49d3df8c87 changes 2 years ago
devamirsaleemahmad 47801ecb36 changes 2 years ago
devamirsaleemahmad c1fd6313b1 changes 2 years ago
Sultan khan b45cbbcf29 updates 2 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
4 years ago
Sikander Saleem 628439ddf8 video call camera view issue fix, barcode plugin change, smart watches improvements. 4 years ago
haroon amjad b0ae08d6a5 updates & fixes 4 years ago
hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/config/config.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/sub_categorise_page.dart
4 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 4 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 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 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
Zohaib Iqbal Kambrani 9fd2304d33 tamara. 4 years ago
haroon amjad e913316c54 Updates 4 years ago
Mirza.Shafique e3bfe83ea2 app bar back icon issue 4 years ago
Mirza.Shafique 3d480bac5c design fixes 3 4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
haroon amjad 832d48971f updates 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
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 4 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 4 years ago
mosazaid b779c250a4 pharmacy cart and wishlist fixes 4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 4 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 4 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 4 years ago
mosazaid c1f3d3cc1c fixes 4 years ago
Elham Rababh ad0c8eaffb fix scaffold 4 years ago
Elham Rababh 65cf4316ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Elham Rababh bb96201c2e remove the custom scaffold 4 years ago
hussam al-habibeh 2265487ccd remove cart cout & icon from AppBar 4 years ago