Fatimah Alshammari
|
c0920e7099
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
Fatimah Alshammari
|
5fa5e9b7c8
|
fixed orders and profile
|
4 years ago |
|
Fatimah Alshammari
|
e5bf7acc52
|
Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
# Conflicts:
# lib/core/viewModels/pharmacyModule/order_model_view_model.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
Fatimah Alshammari
|
fda101840a
|
fixed order isuues
|
4 years ago |
mosazaid
|
0237d71931
|
make firebase-in app messaging commented to solve problem Duplicate class com.google.protobuf.WireFormat$Utf8Validation$3 found in modules jetified-protobuf-javalite-3.11.0.jar (com.google.protobuf:protobuf-javalite:3.11.0) and jetified-protobuf-lite-3.0.1.jar (com.google.protobuf:protobuf-lite:3.0.1)
|
4 years ago |
|
mosazaid
|
359eba2da0
|
make some updates in firebase version and update gradle, finish review order
|
4 years ago |
|
Fatimah Alshammari
|
4a84483698
|
fixed order details
|
4 years ago |
enadhilal
|
727940c5c6
|
fixed merging issues
|
4 years ago |
|
enadhilal
|
9c55571072
|
Merge branch 'pharmacy' into enad_pharmacy2
|
4 years ago |
|
enadhilal
|
c22ca4e29e
|
Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
haroon amjad
|
849723ffd3
|
Merge branch 'pharmacy-Fatima' into 'pharmacy'
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!162
|
4 years ago |
|
enadhilal
|
888a74fb9b
|
add these pages
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
|
4 years ago |
|
Fatimah Alshammari
|
ed68eed9df
|
added links for profile
|
4 years ago |
|
Fatimah Alshammari
|
706980248a
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
|
Fatimah Alshammari
|
9b8103bfd6
|
fixe order and order details
|
4 years ago |
|
haroon amjad
|
9575a236d4
|
Merge branch 'pharmacy-hussam' into 'pharmacy'
Pharmacy hussam
See merge request Cloud_Solution/diplomatic-quarter!155
|
4 years ago |
hussam al-habibeh
|
5dc3c53550
|
mousa and hussam branch
|
4 years ago |
|
hussam al-habibeh
|
a1906a4072
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
4 years ago |
|
hussam al-habibeh
|
800565407d
|
12/6
|
4 years ago |
|
mosazaid
|
4c9a1862d2
|
make pharmacy home page load data even without login, and some mini changes
|
4 years ago |
|
haroon amjad
|
257dc3d76d
|
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
create terms-condition in pharmacy order page
See merge request Cloud_Solution/diplomatic-quarter!154
|
4 years ago |
|
mosazaid
|
7ee7ef58c4
|
working on dynamic title on pharmacy
|
4 years ago |
 umasoodch
|
1f9d592268
|
removed access key code in pubspec
|
4 years ago |
|
umasoodch
|
b5413d1749
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
umasoodch
|
9f0fd8f144
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy
|
4 years ago |
|
mosazaid
|
709ba2ce97
|
create terms-condition in pharmacy order page
|
4 years ago |
|
haroon amjad
|
a85ef855f5
|
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
commit
See merge request Cloud_Solution/diplomatic-quarter!153
|
4 years ago |
|
mosazaid
|
2a91ae787f
|
commit
|
4 years ago |
|
hussam al-habibeh
|
8b8207cb0d
|
search
|
4 years ago |
|
hussam al-habibeh
|
64cbae3602
|
Search
|
4 years ago |
Mohammad Aljammal
|
1394ceed3c
|
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
Pharmacy module feature home page
See merge request Cloud_Solution/diplomatic-quarter!147
|
4 years ago |
|
mosazaid
|
35d0d3e441
|
finsi lakum points task
|
4 years ago |
|
Mohammad Aljammal
|
dbca686adf
|
Merge branch 'hhc_cmc' into 'master'
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!142
|
4 years ago |
Elham Rababah
|
d9ffc5d3da
|
remove duplicated package
|
4 years ago |
|
Elham Rababah
|
713e44cf8b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Elham Rababah
|
ea195ea9bf
|
Finish translate CMC HHC
|
4 years ago |
|
Mohammad Aljammal
|
bda6f58aa3
|
Merge branch 'Haroon' into 'master'
working on ereferral
See merge request Cloud_Solution/diplomatic-quarter!141
|
4 years ago |
haroon amjad
|
4f1f7dcefd
|
ereferral implementation completed
|
4 years ago |
|
haroon amjad
|
65fbd7af8e
|
referral finalised
|
4 years ago |
|
mosazaid
|
98f660e29b
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
mosazaid
|
951c77feb5
|
working on lakum account
|
4 years ago |
|
mosazaid
|
4e5d6a9a00
|
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
|
4 years ago |
|
Elham Rababah
|
5bf63174c9
|
First step from translations
|
4 years ago |
|
haroon amjad
|
82e23efd32
|
working on ereferral
|
4 years ago |
|
umasoodch
|
0431eb1ac8
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
|
4 years ago |
|
Mohammad Aljammal
|
4b435199fc
|
Merge branch 'Haroon' into 'master'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!139
|
4 years ago |
|
haroon amjad
|
6846a8501a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
haroon amjad
|
0181043da8
|
Ereferral fixes, smartwatch health data integration
|
4 years ago |
|
Mohammad Aljammal
|
2185f5ce11
|
Merge branch 'hhc_cmc' into 'master'
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!138
|
4 years ago |
|
Elham Rababah
|
1e1677a365
|
naming issue fix
|
4 years ago |