Commit Graph

561 Commits (8a0d0282ce9df14ea4007bb98850fcb4e9a3122b)

Author SHA1 Message Date
Mohammad Aljammal d4283c0116 fix merge issue 4 years ago
Mohammad Aljammal 4cb63e353b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
4 years ago
mosazaid 4939fe63d1 pharmacy cart fixe counter 4 years ago
Fatimah Alshammari e494c9304d fixed issues 4 years ago
hussam al-habibeh a8fb7152b1 add to cart fix 4 years ago
hussam al-habibeh 75ef3fde80 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
 Conflicts:
	lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart
4 years ago
hussam al-habibeh 66acda38a3 add to cart fix 4 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 4 years ago
mosazaid b779c250a4 pharmacy cart and wishlist fixes 4 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 4 years ago
Mohammad Aljammal 29d0afdea4 Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions

See merge request Cloud_Solution/diplomatic-quarter!424
4 years ago
Elham Rababh 8fac62bcb1 fix bottom sheet functions 4 years ago
mosazaid c1f3d3cc1c fixes 4 years ago
Mohammad Aljammal 0150bc4684 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/ProductCheckTypeWidget.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Mohammad Aljammal eb19daa98f fix car count 4 years ago
Elham Rababh 2981eb3236 fix public card issues 4 years ago
Elham Rababh 7dfc700d26 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Elham Rababh 3b79d0ac41 return the disable colors 4 years ago
hussam al-habibeh c56e4a1a5c cart fix 4 years ago
Mohammad Aljammal 1f9e7563a9 Merge branch 'product_detail_page' into 'development'
fix scaffold

See merge request Cloud_Solution/diplomatic-quarter!409
4 years ago
Elham Rababh ad0c8eaffb fix scaffold 4 years ago
Mohammad Aljammal 361b72624b Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!407
4 years ago
Elham Rababh 65cf4316ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Elham Rababh bb96201c2e remove the custom scaffold 4 years ago
hussam al-habibeh f3000d0ee3 My account design fix 4 years ago
Mohammad Aljammal 424552d672 Merge branch 'pharmacy_fix' into 'development'
add pharmacy icons for bottom nav

See merge request Cloud_Solution/diplomatic-quarter!403
4 years ago
Elham Rababh d5f1a162c0 replace bottom sheet button 4 years ago
hussam al-habibeh 85e6032875 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix 4 years ago
hussam al-habibeh d4fd95606e add pharmacy icons for bottom nav 4 years ago
mosazaid c558fe6bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid fdb61c78c5 fix bugs pharmacy home 4 years ago
hussam al-habibeh cb2b9db0ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix 4 years ago
Mohammad Aljammal b53bd5fd62 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 4 years ago
mosazaid a398ede172 fix bugs pharmacy home 4 years ago
hussam al-habibeh 2265487ccd remove cart cout & icon from AppBar 4 years ago
Elham Rababh 769dc4e0ac first step of ProductDetailPage refactor 4 years ago
Elham Rababh a269b514a9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababh c7a0d39aab first step of ProductDetailPage refactor 4 years ago
Mohammad Aljammal d64e2a469f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
Mohammad Aljammal 8ecd4a24d8 fix product tile 4 years ago
Mohammad Aljammal 8c7f397ac8 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!397
4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
Elham Rababh a6a7ed4e1b remove cart from product details 4 years ago
hussam al-habibeh 7427cd68ff fix bottom nav bar ui 4 years ago
Fatimah Alshammari 62167baec5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 6d72be2a73 fixed cart order issues 4 years ago
haroon amjad 4469ae1209 updates & fixes 4 years ago
haroon amjad e679c7df0d updates & fixes 4 years ago
haroon amjad 44d59ed01a updates & fixes 4 years ago