Fatimah Alshammari
|
333247faa2
|
fixed issues
|
4 years ago |
haroon amjad
|
93517788f5
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Pharmacy fixes
See merge request Cloud_Solution/diplomatic-quarter!512
|
4 years ago |
haroon amjad
|
d630c6c45f
|
Pharmacy fixes
|
4 years ago |
haroon amjad
|
6495e931d7
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Shopping cart fix
See merge request Cloud_Solution/diplomatic-quarter!509
|
4 years ago |
Haroon Amjad
|
464ad9a3cb
|
Shopping cart fix
|
4 years ago |
haroon amjad
|
cbc578250a
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!508
|
4 years ago |
haroon amjad
|
67b6fd4ab6
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Elham Ali
|
f0bb496df5
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!506
|
4 years ago |
haroon amjad
|
7a8ed5b014
|
Total amount calculation fixes
|
4 years ago |
hussam al-habibeh
|
b09bc3bef9
|
merge dev to hussam pharmacy fix
|
4 years ago |
haroon amjad
|
c29aee46dd
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
|
4 years ago |
haroon amjad
|
a3fdb35c30
|
fixes
|
4 years ago |
Elham Ali
|
110672fada
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix calling missing APi
See merge request Cloud_Solution/diplomatic-quarter!507
|
4 years ago |
Elham Rababh
|
f88864efd4
|
fix calling missing APi
|
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 |
hussam al-habibeh
|
307e488a0e
|
pharmacy product pagination
|
4 years ago |
hussam al-habibeh
|
a35e149088
|
product pagination
|
4 years ago |
Elham Ali
|
a9bd9f1fdf
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix bottom bar in cart page
See merge request Cloud_Solution/diplomatic-quarter!504
|
4 years ago |
haroon amjad
|
1686c10851
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
fixes
See merge request Cloud_Solution/diplomatic-quarter!505
|
4 years ago |
haroon amjad
|
289e74fd0a
|
fixes
|
4 years ago |
Elham Rababh
|
05e4e7be45
|
fix bottom bar in cart page
|
4 years ago |
haroon amjad
|
08f0f7b660
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue
See merge request Cloud_Solution/diplomatic-quarter!501
|
4 years ago |
Elham Ali
|
47c2c80b36
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
Nov fixes
See merge request Cloud_Solution/diplomatic-quarter!502
|
4 years ago |
Elham Rababh
|
65aac99806
|
fix Availabilty part
|
4 years ago |
Fatimah Alshammari
|
d1e0b6ccd9
|
fix issue
|
4 years ago |
haroon amjad
|
a74a6d5bc8
|
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!499
|
4 years ago |
haroon amjad
|
f1b44e9f0b
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!500
|
4 years ago |
devmirza121
|
6575456d3b
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
devmirza121
|
dc3d3bc772
|
Health Calculator 5.0
|
4 years ago |
Elham Rababh
|
8a168386da
|
fix black screen which is appear in cart page
|
4 years ago |
Fatimah Alshammari
|
f5de786745
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
96ec3f2926
|
fix issues
|
4 years ago |
Elham Rababh
|
dc7a5d3dca
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
4 years ago |
haroon amjad
|
62c0333dbd
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!498
|
4 years ago |
haroon amjad
|
3ec2f990b1
|
product detail page updates
|
4 years ago |
Fatimah Alshammari
|
c4e185ea60
|
fixed issues
|
4 years ago |
Elham Rababh
|
2c3c270c43
|
finish steps inside payment
|
4 years ago |
Elham Rababh
|
b7dc6ee4b1
|
change model
|
4 years ago |
Fatimah Alshammari
|
444bc7383d
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
62d904aa68
|
fixed issues
|
4 years ago |
Elham Rababh
|
41097f119c
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
4 years ago |
haroon amjad
|
70304427f9
|
Doc specialty fix
|
4 years ago |
haroon amjad
|
11d37d26e5
|
Product Detail page fix
|
4 years ago |
Elham Rababh
|
45d167fc5e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
4 years ago |
haroon amjad
|
fd3d2b588b
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!497
|
4 years ago |
haroon amjad
|
338c646a43
|
updates
|
4 years ago |
haroon amjad
|
534b82461a
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
14b85cc407
|
Family files API changes
|
4 years ago |
haroon amjad
|
740cb79df0
|
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!496
|
4 years ago |
devmirza121
|
590b795356
|
Health Calculator 4.0 marge
|
4 years ago |