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 |
haroon amjad
|
925e3cb686
|
Merge branch 'development' into haroon-new-design
# Conflicts:
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/landing_page_pharmcy.dart
# lib/pages/login/login.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/screens/product-details/product-detail.dart
# lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
# lib/pages/pharmacy/profile/profile.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
4 years ago |
Mohammad Aljammal
|
c0cf2f71a2
|
Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy
See merge request Cloud_Solution/diplomatic-quarter!478
|
4 years ago |
hussam al-habibeh
|
46d7e7ee14
|
show bottom nav in pharmacy all pages
|
4 years ago |
haroon amjad
|
8c99bba17b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
e82b8d4439
|
Lakum & other fixes
|
4 years ago |
haroon amjad
|
f029aaa1c6
|
Fixes & code optimizations
|
4 years ago |
Mohammad Aljammal
|
f424315a19
|
last commit 😄
|
4 years ago |
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 |
Fatimah Alshammari
|
044f74865e
|
fixed issues
|
4 years ago |
hussam al-habibeh
|
bc91b9ad88
|
bottom nav pharmacy
|
4 years ago |
Elham Rababh
|
c97c39ea11
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Oct_fixes
Conflicts:
lib/config/config.dart
lib/pages/pharmacies/screens/cart-page/select_payment_option_widget.dart
|
4 years ago |
mosazaid
|
4939fe63d1
|
pharmacy cart fixe counter
|
4 years ago |
Fatimah Alshammari
|
42e74759e4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
|
4 years ago |
Fatimah Alshammari
|
e6378b7ada
|
fix issues
|
4 years ago |
Elham Rababh
|
616748dc6f
|
fix proceed button
|
4 years ago |
haroon amjad
|
5e5f540431
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
4 years ago |
haroon amjad
|
b08dfb117c
|
Updates & fixes
|
4 years ago |
Elham Rababh
|
2c30b5a494
|
fix issues
|
4 years ago |
Fatimah Alshammari
|
c242910aa2
|
fixed issues
|
4 years ago |
haroon amjad
|
ddf764897a
|
Pharmacy Payment method design fix, Blood Donation fix
|
4 years ago |
Fatimah Alshammari
|
428791c725
|
fixed design
|
4 years ago |
Fatimah Alshammari
|
5e75860d43
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/cart-order-page.dart
# lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
|
4 years ago |
Fatimah Alshammari
|
1089ce3aa3
|
Updates
|
4 years ago |
haroon amjad
|
3dc82a0547
|
Pharmacy updates
|
4 years ago |
haroon amjad
|
eed4fd2509
|
Pharmacy prescriptions page design
|
4 years ago |
haroon amjad
|
9dbe922259
|
pharmacy updates
|
4 years ago |
haroon amjad
|
e58b925382
|
Merge branch 'development' into haroon-new-design
# Conflicts:
# lib/pages/pharmacies/screens/cart-order-page.dart
|
4 years ago |
Fatimah Alshammari
|
a4f404386b
|
fixed issues
|
4 years ago |
haroon amjad
|
41822d2cf1
|
Merge branch 'development' into haroon-new-design
|
4 years ago |
Fatimah Alshammari
|
e494c9304d
|
fixed issues
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
haroon amjad
|
832d48971f
|
updates
|
4 years ago |
Sikander Saleem
|
ba4792cd38
|
merge improvements.
|
4 years ago |
Sikander Saleem
|
706832a1cb
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/locator.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/home_page.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/widgets/ProductTileItem.dart
# lib/pages/search_products_page.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/others/app_scafold_detail_page.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
4 years ago |
haroon amjad
|
ed4fca2d4c
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!444
|
4 years ago |
Fatimah Alshammari
|
9cf0794cf6
|
Fixed out of stuck items issues
|
4 years ago |
Fatimah Alshammari
|
e2763a5bd5
|
fixed cart shopping issues
|
4 years ago |
Fatimah Alshammari
|
d8db5ad590
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/landing/landing_page_pharmcy.dart
# lib/pages/pharmacies/screens/cart-order-page.dart
|
4 years ago |
Fatimah Alshammari
|
30a1353be6
|
fixed brands design and recommended products issues
|
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 |
Elham Rababh
|
2526d6bc6f
|
fix issue in cart page
|
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
|
be21cb352b
|
return recommended products
|
4 years ago |
Fatimah Alshammari
|
8baad999c5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/config/config.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/wishlist.dart
|
4 years ago |
Elham Rababh
|
8fac62bcb1
|
fix bottom sheet functions
|
4 years ago |
Fatimah Alshammari
|
74929f76e5
|
edit home page
|
4 years ago |
Mohammad Aljammal
|
bcd99555e3
|
Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs
See merge request Cloud_Solution/diplomatic-quarter!423
|
4 years ago |
mosazaid
|
c1f3d3cc1c
|
fixes
|
4 years ago |
Elham Rababh
|
944bbce1bf
|
add count to cart
|
4 years ago |
Elham Rababh
|
bfbd04e35d
|
add count to cart
|
4 years ago |
mosazaid
|
acdd19eeed
|
calling cart from pharmacy home and add provider to it
|
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
|
3dc28d318a
|
fix bugs on wish list
|
4 years ago |
Fatimah Alshammari
|
4309952b17
|
fixed subCategories
|
4 years ago |
Sikander Saleem
|
b4031e973e
|
chevron icon to arrow forward
|
4 years ago |
Elham Rababh
|
b0b278a7e3
|
fix bugs
|
4 years ago |
Elham Rababh
|
145117aa63
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
Conflicts:
lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
|
4 years ago |
Elham Rababh
|
9254004125
|
fix coloring issue
|
4 years ago |
mosazaid
|
8b5e1e57c7
|
fix bugs pharmacy wishlist
|
4 years ago |
mosazaid
|
4d37bc2958
|
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
lib/pages/pharmacies/screens/product-details/recommended_products.dart
lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
lib/widgets/others/app_scafold_detail_page.dart
|
4 years ago |
mosazaid
|
a41980b252
|
fix bugs pharmacy wishlist
|
4 years ago |
Elham Rababh
|
7de8c2588f
|
fix coloring issue
|
4 years ago |
Elham Rababh
|
58d43f7e46
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
|
4 years ago |
Elham Rababh
|
2981eb3236
|
fix public card issues
|
4 years ago |
mosazaid
|
0d2d4c64c2
|
fix bugs pharmacy home and increase performance
|
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 |
Elham Rababh
|
47e19c4ab5
|
add loader and cache on images
|
4 years ago |
Mohammad Aljammal
|
48642a3c7c
|
Merge branch 'product_detail_page' into 'development'
Product detail page
See merge request Cloud_Solution/diplomatic-quarter!414
|
4 years ago |
Mohammad Aljammal
|
b175fb7ce0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
|
4 years ago |
Elham Rababh
|
1e1e230908
|
fix call service in case not login
|
4 years ago |
Elham Rababh
|
a5751f0d70
|
handel un login cases
|
4 years ago |
Mohammad Aljammal
|
6339e30369
|
Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home
See merge request Cloud_Solution/diplomatic-quarter!412
|
4 years ago |
mosazaid
|
a9d0b7a14b
|
fix bugs pharmacy home
|
4 years ago |
Elham Rababh
|
19cb48e133
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
|
4 years ago |
Elham Rababh
|
338901d423
|
remove add to cart
|
4 years ago |
Elham Rababh
|
7c15bca746
|
fix item
|
4 years ago |
mosazaid
|
6acb8031d0
|
fix bugs pharmacy home
|
4 years ago |
Mohammad Aljammal
|
76eef8625d
|
Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home
See merge request Cloud_Solution/diplomatic-quarter!411
|
4 years ago |
mosazaid
|
594b2710b3
|
fix bugs pharmacy home
|
4 years ago |
Mohammad Aljammal
|
b64a5b29c5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
Conflicts:
lib/pages/pharmacy/profile/profile.dart
|
4 years ago |
Mohammad Aljammal
|
9e31d497ed
|
fix wish list issue
|
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 |
Elham Rababh
|
e20e90c20c
|
fix quantity_box
|
4 years ago |
Elham Rababh
|
d5f1a162c0
|
replace bottom sheet button
|
4 years ago |
mosazaid
|
185d66e342
|
fix bugs pharmacy home
|
4 years ago |
Elham Rababh
|
6fe41382c0
|
first step from design
|
4 years ago |
mosazaid
|
c558fe6bd9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
|
4 years ago |
mosazaid
|
f47d59c43f
|
fix bugs pharmacy home
|
4 years ago |
Elham Rababh
|
2839af658a
|
fix issues
|
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 |
mosazaid
|
a398ede172
|
fix bugs pharmacy home
|
4 years ago |