haroon amjad
|
615e39baf0
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!523
|
4 years ago |
Fatimah Alshammari
|
bdf3429502
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
|
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 |
haroon amjad
|
1d5898d071
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!520
|
4 years ago |
Fatimah Alshammari
|
54ff9931cb
|
fixed arrow issue order page
|
4 years ago |
hussam al-habibeh
|
7607631052
|
sub categories pagnation
|
4 years ago |
hussam al-habibeh
|
c0e86721f6
|
Merge branch 'nov_fixes' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
lib/pages/pharmacies/widgets/ProductOrderItem.dart
|
4 years ago |
hussam al-habibeh
|
db1820fda4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
haroon amjad
|
fb6183a48b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
4 years ago |
Fatimah Alshammari
|
3bfca80ab9
|
fixed issue
|
4 years ago |
Elham Rababh
|
258e107e1b
|
fix cart order page
|
4 years ago |
hussam al-habibeh
|
ff86dcbdc0
|
sub categories pagnation
|
4 years ago |
Elham Rababh
|
7b6622ee4c
|
fix cart order page
|
4 years ago |
Fatimah Alshammari
|
e3adbe4199
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
haroon amjad
|
a7dccb76bf
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Pharmacy fixes
See merge request Cloud_Solution/diplomatic-quarter!517
|
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
|
cd37941109
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
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
|
93517788f5
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Pharmacy fixes
See merge request Cloud_Solution/diplomatic-quarter!512
|
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
|
6495e931d7
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Shopping cart fix
See merge request Cloud_Solution/diplomatic-quarter!509
|
4 years ago |
Haroon Amjad
|
464ad9a3cb
|
Shopping cart fix
|
4 years ago |
haroon amjad
|
cbc578250a
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!508
|
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 Ali
|
110672fada
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix calling missing APi
See merge request Cloud_Solution/diplomatic-quarter!507
|
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 |