haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
4 years ago |
haroon amjad
|
4823919fcb
|
Pharmacy fixes
|
4 years ago |
haroon amjad
|
f4ccecc1af
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue
See merge request Cloud_Solution/diplomatic-quarter!516
|
4 years ago |
Fatimah Alshammari
|
adfa707eda
|
fix issue
|
4 years ago |
haroon amjad
|
f533dd5356
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart order page
See merge request Cloud_Solution/diplomatic-quarter!515
|
4 years ago |
Elham Rababh
|
6ff829ab91
|
fix cart order page
|
4 years ago |
haroon amjad
|
d78d1f1068
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
sub categorise fix
See merge request Cloud_Solution/diplomatic-quarter!511
|
4 years ago |
haroon amjad
|
6db5577a12
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fixed issues
See merge request Cloud_Solution/diplomatic-quarter!513
|
4 years ago |
haroon amjad
|
d4e71fd8ec
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart back button
See merge request Cloud_Solution/diplomatic-quarter!514
|
4 years ago |
Elham Rababh
|
275871bc39
|
fix addcustomeraddress
|
4 years ago |
hussam al-habibeh
|
e917da9183
|
sub Categorise fixed
|
4 years ago |
hussam al-habibeh
|
80c6be239e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/pages/sub_categorise_page.dart
|
4 years ago |
hussam al-habibeh
|
300668cc81
|
sub Categorise fixed
|
4 years ago |
Fatimah Alshammari
|
333247faa2
|
fixed issues
|
4 years ago |
Elham Rababh
|
fb1d07fcba
|
fix cart back button
|
4 years ago |
haroon amjad
|
d630c6c45f
|
Pharmacy fixes
|
4 years ago |
hussam al-habibeh
|
d7b32df024
|
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
|
9ccb155761
|
sub categorise fix
|
4 years ago |
Haroon Amjad
|
464ad9a3cb
|
Shopping cart fix
|
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 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
|
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 |
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
|
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 |