Commit Graph

347 Commits (7fc47ebf341f6aaa6b8f61ba8c676799e09fa7d6)

Author SHA1 Message Date
haroon amjad 6c20bf50b5 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!553
4 years ago
hussam al-habibeh 3c97122308 pharmacy home dsign 4 years ago
haroon amjad 14b0c4c125 Merge branch 'products_tails' into 'development_new_design_2.0'
fix on design

See merge request Cloud_Solution/diplomatic-quarter!550
4 years ago
Fatimah Alshammari 4d8271c45d fix product details issue 4 years ago
Fatimah Alshammari 169ebac076 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
Elham Rababh d6eeb02c91 fix on design 4 years ago
Fatimah Alshammari fb974af726 fix issues 4 years ago
hussam al-habibeh 01a56da151 merge conflict resolved 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 dbe74b3eb4 fix desing 4 years ago
Fatimah Alshammari db3ea448f6 fix design 4 years ago
Elham Rababh c6be53d800 first step from product details 4 years ago
Elham Rababh a71e7e4075 first step from product details 4 years ago
Fatimah Alshammari 21c315c1a3 fix wishlist issue 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 816dfe4a12 Pharmacy fixes 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 c60cf72640 fix lakum design 4 years ago
Fatimah Alshammari 5ae7471d3e fix issue 4 years ago
Fatimah Alshammari 7b44f3487f fix lakum design 4 years ago
Fatimah Alshammari e9a86b4e1c fix lakum 4 years ago
Fatimah Alshammari d25f888c3e Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari a858d8764a fixed issues 4 years ago
haroon amjad 4b446bb6d0 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 333b41632c fixes 4 years ago
haroon amjad 5bb20ea9a2 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 5f0985adaa Updates 4 years ago
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
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 11d37d26e5 Product Detail page fix 4 years ago
Elham Rababh 4e54349e3b Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
Elham Rababh df9e58402d first step from update design 4 years ago
hussam al-habibeh b2b786d157 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
haroon amjad 6ffa07392c Product detail page updates 4 years ago
Elham Rababh f8883f5439 first step from fixing check out process 4 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 4 years ago
Fatimah Alshammari 239d2c1036 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad e1e31de818 Lakum fixes 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