diff --git a/lib/config/config.dart b/lib/config/config.dart index 7aea6857..9e17af68 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -16,9 +16,7 @@ const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_ORDERS = '/api/orders'; const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // const BASE_URL = 'https://uat.hmgwebservices.com/'; -// const BASE_URL = 'https://hmgwebservices.com/'; -const BASE_URL = 'https://uat.hmgwebservices.com/'; -// const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs // const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 86acac5c..49c8d0d6 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -384,6 +384,7 @@ class _Login extends State { getRegisterData() async { var registerData = await sharedPref.getObject(REGISTER_DATA_FOR_LOGIIN); + await sharedPref.remove(REGISTER_DATA_FOR_LOGIIN); if (registerData != null) { setState(() { diff --git a/lib/pages/login/register.dart b/lib/pages/login/register.dart index 540174c7..11ed7c79 100644 --- a/lib/pages/login/register.dart +++ b/lib/pages/login/register.dart @@ -329,15 +329,17 @@ class _Register extends State { nRequest['LogInTokenID'] = response['LogInTokenID']; if (response['hasFile'] == true) { ConfirmDialog dialog = new ConfirmDialog( - context: context, - confirmMessage: response['ErrorEndUserMessage'], - okText: TranslationBase.of(context).ok, - okFunction: () { - AlertDialogBox.closeAlertDialog(context); - - sharedPref.setObject(REGISTER_DATA_FOR_LOGIIN, nRequest); - Navigator.of(context).push(FadePage(page: Login())); - }).showAlertDialog(context); + context: context, + confirmMessage: response['ErrorEndUserMessage'], + okText: TranslationBase.of(context).ok, + cancelText: TranslationBase.of(context).cancel, + okFunction: () { + AlertDialogBox.closeAlertDialog(context); + sharedPref.setObject(REGISTER_DATA_FOR_LOGIIN, nRequest); + Navigator.of(context).push(FadePage(page: Login())); + }, + cancelFunction: () {}) + .showAlertDialog(context); } else { nRequest['forRegister'] = true; nRequest['isRegister'] = true;