make pharmacy home page load data even without login, and some mini changes

merge-update-with-lab-changes
mosazaid 5 years ago
parent 257dc3d76d
commit 4c9a1862d2

@ -268,6 +268,7 @@ class BaseAppClient {
logout() async { logout() async {
await sharedPref.remove(LOGIN_TOKEN_ID); await sharedPref.remove(LOGIN_TOKEN_ID);
await sharedPref.remove(PHARMACY_CUSTOMER_ID);
await authenticatedUserObject.getUser(); await authenticatedUserObject.getUser();
Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isLogin = Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isLogin =
false; false;

@ -17,8 +17,7 @@ class PharmacyModuleService extends BaseService {
List<PharmacyProduct> bestSellerProducts = List(); List<PharmacyProduct> bestSellerProducts = List();
List<PharmacyProduct> lastVisitedProducts = List(); List<PharmacyProduct> lastVisitedProducts = List();
Future makeVerifyCustomer() async { Future makeVerifyCustomer(dynamic data) async {
var data = await sharedPref.getObject(USER_PROFILE);
Map<String, String> queryParams = {'FileNumber': data['PatientID'].toString()}; Map<String, String> queryParams = {'FileNumber': data['PatientID'].toString()};
hasError = false; hasError = false;
try { try {

@ -23,19 +23,31 @@ class PharmacyModuleViewModel extends BaseViewModel {
Future getPharmacyHomeData() async { Future getPharmacyHomeData() async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _pharmacyService.makeVerifyCustomer(); var data = await sharedPref.getObject(USER_PROFILE);
// here must call getShoppingCard() var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID);
if (_pharmacyService.hasError) {
error = _pharmacyService.error; if (authenticatedUserObject.isLogin && data != null && customerId == null) {
setState(ViewState.Error); await _pharmacyService.makeVerifyCustomer(data);
} else { // here must call getShoppingCard()
await _pharmacyService.getBannerListList();
if (_pharmacyService.hasError) { if (_pharmacyService.hasError) {
error = _pharmacyService.error; error = _pharmacyService.error;
setState(ViewState.Error); setState(ViewState.Error);
} else { } else {
_getTopManufacturerList(); await getBannerList();
} }
} else {
await getBannerList();
}
}
Future getBannerList() async {
setState(ViewState.Busy);
await _pharmacyService.getBannerListList();
if (_pharmacyService.hasError) {
error = _pharmacyService.error;
setState(ViewState.Error);
} else {
_getTopManufacturerList();
} }
} }

@ -17,8 +17,9 @@ class CartOrderPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final mediaQuery = MediaQuery.of(context); final mediaQuery = MediaQuery.of(context);
PreferredSizeWidget appBarWidget = PreferredSizeWidget appBarWidget =
AppBarWidget("Shopping Cart", null, true); AppBarWidget(TranslationBase.of(context).shoppingCart, null, true);
final height = mediaQuery.size.height - final height = mediaQuery.size.height -
appBarWidget.preferredSize.height - appBarWidget.preferredSize.height -
mediaQuery.padding.top; mediaQuery.padding.top;

@ -28,7 +28,7 @@ class LakumTermsConditions extends StatelessWidget {
return BaseView<LacumRegistrationViewModel>( return BaseView<LacumRegistrationViewModel>(
onModelReady: (model) => model.getUserTermsAndConditionsForEPharmcy(), onModelReady: (model) => model.getUserTermsAndConditionsForEPharmcy(),
builder: (_, model, wi) => AppScaffold( builder: (_, model, wi) => AppScaffold(
title: "Register Lakum", appBarTitle: "Register Lakum",
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
backgroundColor: Colors.white, backgroundColor: Colors.white,

@ -16,7 +16,7 @@ class PharmacyTermsConditions extends StatelessWidget {
return BaseView<TermsConditionViewModel>( return BaseView<TermsConditionViewModel>(
onModelReady: (model) => model.getUserTermsAndConditionsForEPharmcy(), onModelReady: (model) => model.getUserTermsAndConditionsForEPharmcy(),
builder: (_, model, wi) => AppScaffold( builder: (_, model, wi) => AppScaffold(
title: TranslationBase.of(context).termOfService, appBarTitle: TranslationBase.of(context).termOfService,
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
isPharmacy: true, isPharmacy: true,

@ -21,6 +21,7 @@ class PharmacyPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<PharmacyModuleViewModel>( return BaseView<PharmacyModuleViewModel>(
onModelReady: (model) => model.getPharmacyHomeData(), onModelReady: (model) => model.getPharmacyHomeData(),
allowAny: true,
builder: (_, model, wi) => AppScaffold( builder: (_, model, wi) => AppScaffold(
title: "", title: "",
isShowAppBar: true, isShowAppBar: true,

@ -1022,7 +1022,7 @@ class TranslationBase {
String get point => localizedValues['point'][locale.languageCode]; String get point => localizedValues['point'][locale.languageCode];
String get riyal => localizedValues['riyal'][locale.languageCode]; String get riyal => localizedValues['riyal'][locale.languageCode];
String get termOfService => localizedValues['termOfService'][locale.languageCode]; String get termOfService => localizedValues['termOfService'][locale.languageCode];
String get shoppingCart => localizedValues['ShoppingCart'][locale.languageCode]; String get shoppingCart => localizedValues['shoppingCart'][locale.languageCode];
String get referralStatus => String get referralStatus =>
localizedValues['referralStatus'][locale.languageCode]; localizedValues['referralStatus'][locale.languageCode];

Loading…
Cancel
Save