Fatimah Alshammari
|
ffc2f2b4bb
|
fix issues
|
4 years ago |
Fatimah Alshammari
|
1539945a29
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
c87a391a23
|
fixed wishlist issue
|
4 years ago |
haroon amjad
|
e67e17c2ba
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
7d29ee4468
|
cart order page fixes
|
4 years ago |
Fatimah Alshammari
|
a2a6da1527
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
5dc1561992
|
fixed notify issue
|
4 years ago |
haroon amjad
|
d0c96d245b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
4 years ago |
Fatimah Alshammari
|
468d64a1e0
|
fix design issue
|
4 years ago |
haroon amjad
|
7c6fa89d63
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
7ffc467552
|
Lakum fixes
|
4 years ago |
Fatimah Alshammari
|
998c1af0f7
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
ae3bb1bb2d
|
fix issues
|
4 years ago |
haroon amjad
|
61a406085b
|
lakum fixes
|
4 years ago |
haroon amjad
|
87a997d156
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!521
|
4 years ago |
hussam al-habibeh
|
7607631052
|
sub categories pagnation
|
4 years ago |
haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
4 years ago |
Elham Rababh
|
258e107e1b
|
fix cart order page
|
4 years ago |
Elham Rababh
|
7b6622ee4c
|
fix cart order page
|
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
|
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 |
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 |
haroon amjad
|
67b6fd4ab6
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
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
|
a3fdb35c30
|
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 |
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 |
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 |
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
|
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 |