haroon amjad
|
330f2d6c86
|
Fixes & updates
|
4 years ago |
hussam al-habibeh
|
516fddf962
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
hussam al-habibeh
|
e291d46af7
|
pharmacy uo fix
|
4 years ago |
haroon amjad
|
d7de2d6802
|
Merge branch 'products_tails' into 'development_new_design_2.0'
Products tails
See merge request Cloud_Solution/diplomatic-quarter!557
|
4 years ago |
Elham Rababh
|
b2814d0183
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into products_tails
|
4 years ago |
hussam al-habibeh
|
6b1c0e04d0
|
pharmacy design home page
|
4 years ago |
Elham Rababh
|
16c1064a45
|
PMAU-19
|
4 years ago |
hussam al-habibeh
|
01433963bd
|
pharmacy home design
|
4 years ago |
hussam al-habibeh
|
1984400239
|
fix ontap on prodcut card
|
4 years ago |
hussam al-habibeh
|
3c97122308
|
pharmacy home dsign
|
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 |
hussam al-habibeh
|
8c4af92832
|
pharmacy new design home
|
4 years ago |
hussam al-habibeh
|
a5e7541394
|
new design pharmacy home
|
4 years ago |
Elham Rababh
|
c5be1472e7
|
first step from product details
|
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 |
haroon amjad
|
a88889ec1d
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
small fix in order details
See merge request Cloud_Solution/diplomatic-quarter!540
|
4 years ago |
Elham Rababh
|
6439fe264a
|
small fix in order details
|
4 years ago |
Fatimah Alshammari
|
7b44f3487f
|
fix lakum design
|
4 years ago |
Fatimah Alshammari
|
a858d8764a
|
fixed issues
|
4 years ago |
haroon amjad
|
61a406085b
|
lakum fixes
|
4 years ago |
hussam al-habibeh
|
7607631052
|
sub categories pagnation
|
4 years ago |
Elham Rababh
|
258e107e1b
|
fix cart order page
|
4 years ago |
Elham Rababh
|
7b6622ee4c
|
fix cart order page
|
4 years ago |
Fatimah Alshammari
|
333247faa2
|
fixed issues
|
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 |
Fatimah Alshammari
|
62d904aa68
|
fixed issues
|
4 years ago |
hussam al-habibeh
|
5927f3e35f
|
pharmacy home page update
|
4 years ago |
haroon amjad
|
be771917f0
|
pharmacy fixes
|
4 years ago |
haroon amjad
|
bebcd85557
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
5943522163
|
UI fixes
|
4 years ago |
Fatimah Alshammari
|
28678633e7
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/lakum-main-page.dart
|
4 years ago |
Fatimah Alshammari
|
78fc77159c
|
fix lakum issues
|
4 years ago |
haroon amjad
|
8d6278a59b
|
Pharmacy fixes
|
4 years ago |
Fatimah Alshammari
|
044f74865e
|
fixed issues
|
4 years ago |
Fatimah Alshammari
|
42e74759e4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
|
4 years ago |
Fatimah Alshammari
|
e6378b7ada
|
fix issues
|
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 |
haroon amjad
|
b08dfb117c
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
c242910aa2
|
fixed issues
|
4 years ago |
Fatimah Alshammari
|
428791c725
|
fixed design
|
4 years ago |
haroon amjad
|
eed4fd2509
|
Pharmacy prescriptions page design
|
4 years ago |
haroon amjad
|
e58b925382
|
Merge branch 'development' into haroon-new-design
# Conflicts:
# lib/pages/pharmacies/screens/cart-order-page.dart
|
4 years ago |
Fatimah Alshammari
|
a4f404386b
|
fixed issues
|
4 years ago |
haroon amjad
|
41822d2cf1
|
Merge branch 'development' into haroon-new-design
|
4 years ago |
Fatimah Alshammari
|
e494c9304d
|
fixed issues
|
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 |
Fatimah Alshammari
|
e2763a5bd5
|
fixed cart shopping issues
|
4 years ago |
mosazaid
|
0d2d4c64c2
|
fix bugs pharmacy home and increase performance
|
4 years ago |