Commit Graph

1871 Commits (e917da91838ace226f152d43b0a7b4fe6e621ad4)

Author SHA1 Message Date
hussam al-habibeh e917da9183 sub Categorise fixed 3 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
3 years ago
hussam al-habibeh 300668cc81 sub Categorise fixed 3 years ago
haroon amjad d630c6c45f Pharmacy fixes 3 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 3 years ago
hussam al-habibeh 9ccb155761 sub categorise fix 3 years ago
haroon amjad 67b6fd4ab6 Merge branch 'development_new_design_2.0' into haroon-new-design 3 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
3 years ago
haroon amjad 7a8ed5b014 Total amount calculation fixes 3 years ago
hussam al-habibeh b09bc3bef9 merge dev to hussam pharmacy fix 3 years ago
haroon amjad c29aee46dd Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
3 years ago
haroon amjad a3fdb35c30 fixes 3 years ago
Elham Rababh f88864efd4 fix calling missing APi 3 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
3 years ago
hussam al-habibeh 307e488a0e pharmacy product pagination 3 years ago
hussam al-habibeh a35e149088 product pagination 3 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
3 years ago
haroon amjad 289e74fd0a fixes 3 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 3 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
3 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
3 years ago
Elham Rababh 65aac99806 fix Availabilty part 3 years ago
Fatimah Alshammari d1e0b6ccd9 fix issue 3 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
3 years ago
devmirza121 6575456d3b Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
devmirza121 dc3d3bc772 Health Calculator 5.0 3 years ago
Elham Rababh 8a168386da fix black screen which is appear in cart page 3 years ago
Fatimah Alshammari f5de786745 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
Fatimah Alshammari 96ec3f2926 fix issues 3 years ago
Elham Rababh dc7a5d3dca Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 3 years ago
haroon amjad 3ec2f990b1 product detail page updates 3 years ago
Fatimah Alshammari c4e185ea60 fixed issues 3 years ago
Elham Rababh 2c3c270c43 finish steps inside payment 3 years ago
Elham Rababh b7dc6ee4b1 change model 3 years ago
Fatimah Alshammari 444bc7383d Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
Fatimah Alshammari 62d904aa68 fixed issues 3 years ago
Elham Rababh 41097f119c Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 3 years ago
haroon amjad 70304427f9 Doc specialty fix 3 years ago
haroon amjad 11d37d26e5 Product Detail page fix 3 years ago
Elham Rababh 45d167fc5e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 3 years ago
haroon amjad 338c646a43 updates 3 years ago
haroon amjad 534b82461a Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 14b85cc407 Family files API changes 3 years ago
devmirza121 a131f24952 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
devmirza121 1d1708bdcc Health Calculator 4.0 3 years ago
Elham Rababh 4e54349e3b Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 3 years ago
Elham Rababh df9e58402d first step from update design 3 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 3 years ago
haroon amjad 6ffa07392c Product detail page updates 3 years ago
Elham Rababh f8883f5439 first step from fixing check out process 3 years ago