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 |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
Sultan Khan
|
73ff5c4707
|
Bug fixes
|
4 years ago |
Sikander Saleem
|
e3758cfbba
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
ff5fbbdf7c
|
Service info app bar fixed.
|
4 years ago |
Sikander Saleem
|
fab051f9e7
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Fatimah Alshammari
|
827d8733a1
|
fixed shopping cart issue
|
4 years ago |
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
4 years ago |
Sikander Saleem
|
d605084a91
|
appointment list and detail ui changed
|
4 years ago |
Elham Rababh
|
ab2fc6aa2c
|
fix issues related to footer
|
4 years ago |
Elham Rababh
|
69df61afb1
|
remove footer from pharmacy pages
|
4 years ago |
Elham Rababh
|
8626b4f269
|
first step from add footer for all pages
|
4 years ago |
Sikander Saleem
|
4db432b351
|
lab results working(cont.) & improvements
|
4 years ago |
Sikander Saleem
|
70614d3555
|
merge improvements-1.
|
5 years ago |
Sikander Saleem
|
f6ae7ed770
|
merge changes-4
|
5 years ago |
Sikander Saleem
|
53e4815866
|
no auth ui modifications
|
5 years ago |
Sultan Khan
|
14ef096c32
|
changes and fixes
|
5 years ago |
Sikander Saleem
|
7771b8f320
|
PAP-886 fixed, Insurance image button added.
|
5 years ago |
Sikander Saleem
|
db84090694
|
PAP-872 & PAP-593 fixed, Water addition was not visible.
|
5 years ago |
Sultan Khan
|
8e255f1f22
|
bug fix
|
5 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
|
5 years ago |
Zohaib Iqbal Kambrani
|
6f2c947687
|
Packages And offers..
|
5 years ago |
Zohaib Iqbal Kambrani
|
f410ce20ca
|
Packages and Offers in Progress
|
5 years ago |