From 259581c4f88683afe10714ef0799350168213d1e Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 10 Oct 2021 11:42:34 +0300 Subject: [PATCH] updates & fixes --- lib/config/shared_pref_kay.dart | 1 + .../customer_addresses_service.dart | 7 +++---- .../parmacyModule/parmacy_module_service.dart | 1 + .../AlHabibMedicalService/cmc_view_model.dart | 3 --- .../home_health_care_view_model.dart | 3 --- lib/core/viewModels/er/rrt-view-model.dart | 17 +++++++++++++++-- .../rrt-pickup-address-page.dart | 2 -- .../rapid-response-team/rrt-request-page.dart | 3 ++- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/lib/config/shared_pref_kay.dart b/lib/config/shared_pref_kay.dart index 752938ad..c1dc168c 100644 --- a/lib/config/shared_pref_kay.dart +++ b/lib/config/shared_pref_kay.dart @@ -21,6 +21,7 @@ const THEME_VALUE = 'is_vibration'; const MAIN_USER = 'main-user'; const PHARMACY_LAST_VISITED_PRODUCTS = 'last-visited'; const PHARMACY_CUSTOMER_ID = 'costumer-id'; +const PHARMACY_CUSTOMER_OBJECT = 'pharmacy-customer-object'; const IS_ROBOT_VISIBLE = 'robot-visible'; const IS_ROBOT_INIT = 'robot-init'; const HMG_GEOFENCES = 'hmg-geo-fences'; diff --git a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart index 260b3a92..bd2e94e4 100644 --- a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart +++ b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart @@ -1,16 +1,14 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/add_new_address_Request_Model.dart'; -import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:intl/intl.dart'; -import '../../../locator.dart'; import '../base_service.dart'; class CustomerAddressesService extends BaseService { List addressesList = List(); - CustomerInfo customerInfo; + CustomerInfo customerInfo = new CustomerInfo(); Future addAddressInfo({AddNewAddressRequestModel addNewAddressRequestModel}) async { addNewAddressRequestModel.customer.email = customerInfo.email; @@ -40,7 +38,8 @@ class CustomerAddressesService extends BaseService { Future getCustomerAddresses() async { Map queryParams = {'fields': 'addresses'}; hasError = false; - await baseAppClient.getPharmacy("$BASE_PHARMACY_URL$GET_CUSTOMER_ADDRESSES${customerInfo.customerId}", onSuccess: (dynamic response, int statusCode) { + var customerID = await sharedPref.getObject(PHARMACY_CUSTOMER_ID); + await baseAppClient.getPharmacy("$BASE_PHARMACY_URL$GET_CUSTOMER_ADDRESSES$customerID", onSuccess: (dynamic response, int statusCode) { addressesList.clear(); response["customers"][0]["addresses"].forEach((data) { addressesList.add(AddressInfo.fromJson(data)); diff --git a/lib/core/service/parmacyModule/parmacy_module_service.dart b/lib/core/service/parmacyModule/parmacy_module_service.dart index 9cca6ac9..58ce50f5 100644 --- a/lib/core/service/parmacyModule/parmacy_module_service.dart +++ b/lib/core/service/parmacyModule/parmacy_module_service.dart @@ -57,6 +57,7 @@ class PharmacyModuleService extends BaseService { } else { customerInfo = CustomerInfo.fromJson(response); + await sharedPref.setObject(PHARMACY_CUSTOMER_ID, customerInfo.customerId); } // await generatePharmacyToken(); }, onFailure: (String error, int statusCode) { diff --git a/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart b/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart index d7e290d0..de007d67 100644 --- a/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart +++ b/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart @@ -122,16 +122,13 @@ class CMCViewModel extends BaseViewModel { Future getCustomerInfo() async { setState(ViewState.Busy); await _pharmacyModuleService.generatePharmacyToken(); - // await _pharmacyModuleService.createUser(); if (_customerAddressesService.hasError) { error = _customerAddressesService.error; await _pharmacyModuleService.createUser(); - // await _customerAddressesService.getCustomerInfo(); setState(ViewState.ErrorLocal); } else { await _pharmacyModuleService.createUser(); - // await _customerAddressesService.getCustomerInfo(); await getCustomerAddresses(); } } diff --git a/lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart b/lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart index d7d9f1c2..91465b11 100644 --- a/lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart +++ b/lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart @@ -105,16 +105,13 @@ class HomeHealthCareViewModel extends BaseViewModel { Future getCustomerInfo() async { setState(ViewState.Busy); await _pharmacyModuleService.generatePharmacyToken(); - // await _pharmacyModuleService.createUser(); if (_customerAddressesService.hasError) { error = _customerAddressesService.error; await _pharmacyModuleService.createUser(); - // await _customerAddressesService.getCustomerInfo(); setState(ViewState.ErrorLocal); } else { await _pharmacyModuleService.createUser(); - // await _customerAddressesService.getCustomerInfo(); await getCustomerAddresses(); } } diff --git a/lib/core/viewModels/er/rrt-view-model.dart b/lib/core/viewModels/er/rrt-view-model.dart index 339f6874..19179313 100644 --- a/lib/core/viewModels/er/rrt-view-model.dart +++ b/lib/core/viewModels/er/rrt-view-model.dart @@ -152,14 +152,27 @@ class RRTViewModel extends BaseViewModel { Future getCustomerInfo() async { setState(ViewState.Busy); await _pharmacy_service.generatePharmacyToken(); + if (_customerAddressesService.hasError) { error = _customerAddressesService.error; await _pharmacy_service.createUser(); - await getCustomerAddresses(); setState(ViewState.ErrorLocal); } else { - await _customerAddressesService.getCustomerInfo(); + await _pharmacy_service.createUser(); await getCustomerAddresses(); } + + + // setState(ViewState.Busy); + // await _pharmacy_service.generatePharmacyToken(); + // if (_customerAddressesService.hasError) { + // error = _customerAddressesService.error; + // await _pharmacy_service.createUser(); + // await getCustomerAddresses(); + // setState(ViewState.ErrorLocal); + // } else { + // await _customerAddressesService.getCustomerInfo(); + // await getCustomerAddresses(); + // } } } diff --git a/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart b/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart index 7a82ecff..e738a438 100644 --- a/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart +++ b/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart @@ -116,9 +116,7 @@ class RRTRequestPickupAddressPageState extends State { else AppToast.showErrorToast(message: TranslationBase.of(context).pleaseAcceptTerms); }, - color: acceptTerms ? Colors.red[600] : Colors.grey, + color: acceptTerms ? CustomColors.accentColor : Colors.grey, ), ), ],