14 Commits (bebcd8555751f1c2552aaeb5bcd3e71718a6e640)

Author	SHA1	Message	Date
haroon amjad	8d6278a59b	Pharmacy fixes	3 years ago
Zohaib Iqbal Kambrani	9d71793e88	no message	3 years ago
Zohaib Iqbal Kambrani	9fd2304d33	tamara.	3 years ago
Zohaib Iqbal Kambrani	f3462dfc19	Applied cost from api at cart	3 years ago
Zohaib Iqbal Kambrani	8b1ac05012	Merge branch 'development_new_design_2.0' into zik_new_design_2.0 ... * development_new_design_2.0: (105 commits) app bar back icon issue improvements emergency nearest ui changes Zoom Avatar implementation no message Child Vaccine 3 register register page Working on Health data Child Vaccine 2 registration Ereferral fixed, HHC moved to new APIs, Notification new design implemented registration done Child Vaccine 1.0 In App Review In App Review oder log merge fix design fixes 3 Chart fix & In-App update implemented design fixes 1.1 ... # Conflicts: # lib/config/config.dart # lib/pages/landing/fragments/home_page_fragment2.dart	3 years ago
Zohaib Iqbal Kambrani	aad071ac67	Packages and Offers apply token	3 years ago
Mirza.Shafique	a273bacc17	design fixes 1.1	3 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	3 years ago
Mohammad Aljammal	9e31d497ed	fix wish list issue	3 years ago
haroon amjad	7467da7409	Imports organized	3 years ago
hussam al-habibeh	14939d3513	jira bugs (Health Calculator)	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
Zohaib Iqbal Kambrani	6f2c947687	Packages And offers..	4 years ago
Zohaib Iqbal Kambrani	f410ce20ca	Packages and Offers in Progress	4 years ago