Commit Graph

40 Commits (123b1de1a45a2e0696ef29fedd7b233573e1c946)

Author SHA1 Message Date
Fatimah Alshammari a46dddea9a Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/model/pharmacies/order_model.dart
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/profile/profile.dart
5 years ago
Fatimah Alshammari c629fcb85c fixed recommended products new design 5 years ago
mosazaid f3cdd08857 adding fharmacy payment feature 5 years ago
enadhilal 0cb493d56c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/pages/pharmacies/product_detail.dart
5 years ago
enadhilal 0c6fb67718 fixed issues 5 years ago
Fatimah Alshammari 42bf76f712 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
5 years ago
Fatimah Alshammari ac32ba998c fixed order isuee 5 years ago
mosazaid 1a45f99606 some fixes on pharmacy 5 years ago
Fatimah Alshammari ef8312f2b8 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/pharmacies/product_detail.dart
5 years ago
Fatimah Alshammari ce64da11e4 homepage and product details design 5 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 5 years ago
Sikander Saleem 8f37fbf260 Qr icon added, notify me api added & improvements 5 years ago
Fatimah Alshammari 0f22a50a5d Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy/profile/profile.dart
5 years ago
Fatimah Alshammari ba4003cb56 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/locator.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/profile/profile.dart
5 years ago
Fatimah Alshammari 52fa0f6f89 fixed orders 5 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 years ago
Mohammad Aljammal 3fb522e15f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
	lib/core/model/pharmacies/order_model.dart
	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
	lib/locator.dart
	lib/main.dart
	lib/pages/landing/landing_page_pharmcy.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/cart-order-preview.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/pages/pharmacies/wishlist.dart
	lib/pages/pharmacy/order/Order.dart
	lib/pages/pharmacy/order/OrderDetails.dart
	lib/pages/pharmacy/order/ProductReview.dart
	lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
	lib/pages/pharmacy/profile/profile.dart
	lib/services/pharmacy_services/orderDetails_service.dart
	lib/services/pharmacy_services/order_service.dart
	lib/services/pharmacy_services/pharmacyAddress_service.dart
	lib/services/pharmacy_services/wishList_service.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/borderedButton.dart
	lib/widgets/others/app_scaffold_widget.dart
	lib/widgets/pharmacy/product_tile.dart
5 years ago
Mohammad Aljammal 16d1f667d4 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
 Conflicts:
	android/app/build.gradle
	lib/config/config.dart
	lib/pages/pharmacy/profile/profile.dart
	lib/widgets/pharmacy/product_tile.dart
5 years ago
mosazaid 38d58ebaaf Merge branch 'pharmacy' into pharmacy_mosa_branch
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
#	lib/services/pharmacy_services/pharmacyAddress_service.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
enadhilal 10734d5994 connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
5 years ago
Fatimah Alshammari c0920e7099 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/widgets/pharmacy/product_tile.dart
5 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
5 years ago
Fatimah Alshammari fda101840a fixed order isuues 5 years ago
mosazaid 359eba2da0 make some updates in firebase version and update gradle, finish review order 5 years ago
Fatimah Alshammari 4a84483698 fixed order details 5 years ago
mosazaid 6ac8d67b83 finish address add/edit/delete/select 5 years ago
enadhilal 9c55571072 Merge branch 'pharmacy' into enad_pharmacy2 5 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
5 years ago
enadhilal 888a74fb9b add these pages
​Product Tile Component
Product Detail Page
​Wishlist Page
​Reviews Page
Brands Page + Search
5 years ago
Fatimah Alshammari 706980248a Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
5 years ago
Fatimah Alshammari 9b8103bfd6 fixe order and order details 5 years ago
mosazaid 4c9a1862d2 make pharmacy home page load data even without login, and some mini changes 5 years ago
mosazaid 709ba2ce97 create terms-condition in pharmacy order page 5 years ago
mosazaid 35d0d3e441 finsi lakum points task 5 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
5 years ago
mosazaid 4e5d6a9a00 finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished 5 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 5 years ago
mosazaid 9a169ff77b finish home page and start working on order preview page 5 years ago
mosazaid d1ac4080ca working on pharmacy home page 5 years ago