diff --git a/lib/Login/ViewModel/LoginApi.dart b/lib/Login/ViewModel/LoginApi.dart index f6f4280..7cd1bb8 100644 --- a/lib/Login/ViewModel/LoginApi.dart +++ b/lib/Login/ViewModel/LoginApi.dart @@ -41,17 +41,17 @@ class LoginAPI { if (accountype == "1") { print('tell us individyal'); Get.toNamed(RouteName.tellusindividualscreen, - arguments: { - 'pageroute' : "mainscreen" - } + // arguments: { + // 'pageroute' : "mainscreen" + // } ); } else if (accountype == "2") { print('tell us business'); Get.toNamed(RouteName.tellusbusinessscreen, - arguments: { - 'pageroute' : "mainscreen" - } + // arguments: { + // 'pageroute' : "mainscreen" + // } ); } } else { diff --git a/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart b/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart index 855791e..f5a9d71 100644 --- a/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart +++ b/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart @@ -46,7 +46,7 @@ class _TellusaboutBusinessState extends State { }); } - String pagename = Get.arguments["pageroute"]; + // String pagename = Get.arguments["pageroute"]; String getBusinessTypeId(String selectedBusinessType) { if (selectedBusinessType.contains("Retail")) { @@ -103,12 +103,12 @@ class _TellusaboutBusinessState extends State { snackPosition: SnackPosition.BOTTOM, ); - if (pagename == "nextscreen") { + // if (pagename == "nextscreen") { Get.toNamed(RouteName.businessletusunderstandstep1); - } else if (pagename == "mainscreen") { - Get.toNamed(RouteName.mainscreen); - } + // } else if (pagename == "mainscreen") { + // Get.toNamed(RouteName.mainscreen); + // } } else if (data.status == ResponseStatus.FAILED) { Get.snackbar( diff --git a/lib/onboarding/Signup/View/Individual/tellusindividual.dart b/lib/onboarding/Signup/View/Individual/tellusindividual.dart index b66ccf6..4d17909 100644 --- a/lib/onboarding/Signup/View/Individual/tellusindividual.dart +++ b/lib/onboarding/Signup/View/Individual/tellusindividual.dart @@ -36,7 +36,7 @@ class _TellusaboutIndividualState extends State { TextEditingController datecontroller = TextEditingController(); TextEditingController locationcontroller = TextEditingController(); - String pagename = Get.arguments["pageroute"]; + // String pagename = Get.arguments["pageroute"]; DateTime? _selectedDate; @@ -164,12 +164,12 @@ class _TellusaboutIndividualState extends State { utils.showToast("tell us done Successfully!"); Get.back(); // Get.toNamed(RouteName.individualprofilestep1); - if (pagename == "nextscreen") { + // if (pagename == "nextscreen") { Get.toNamed(RouteName.individualactivitystep2); - } else if (pagename == "mainscreen") { - Get.toNamed(RouteName.mainscreen); - } + // } else if (pagename == "mainscreen") { + // Get.toNamed(RouteName.mainscreen); + // } } else { Get.back(); return utils.showToast(data.message); diff --git a/lib/onboarding/Signup/View/verifyuser.dart b/lib/onboarding/Signup/View/verifyuser.dart index 2338cbe..0617096 100644 --- a/lib/onboarding/Signup/View/verifyuser.dart +++ b/lib/onboarding/Signup/View/verifyuser.dart @@ -55,16 +55,16 @@ class _VerifyuserScreenStateState extends State { if (accounttype == 'Individual') { print('individual selected'); Get.toNamed(RouteName.tellusindividualscreen, - arguments: { - 'pageroute' : "nextscreen" - } + // arguments: { + // 'pageroute' : "nextscreen" + // } ); } else if (accounttype == 'Business') { print('business selected'); Get.toNamed(RouteName.tellusbusinessscreen, - arguments: { - 'pageroute' : "nextscreen" - } + // arguments: { + // 'pageroute' : "nextscreen" + // } ); } diff --git a/lib/onboarding/SplashScreen.dart b/lib/onboarding/SplashScreen.dart index 0fcb10d..28dc4e8 100644 --- a/lib/onboarding/SplashScreen.dart +++ b/lib/onboarding/SplashScreen.dart @@ -100,10 +100,12 @@ class _SplashScreenState extends State { if (accountype == "1") { Get.toNamed(RouteName.tellusindividualscreen, - arguments: {'pageroute': "mainscreen"}); + // arguments: {'pageroute': "mainscreen"} + ); } else if (accountype == "2") { Get.toNamed(RouteName.tellusbusinessscreen, - arguments: {'pageroute': "mainscreen"}); + // arguments: {'pageroute': "mainscreen"} + ); } } else { Get.toNamed(RouteName.mainscreen); @@ -157,10 +159,12 @@ class _SplashScreenState extends State { if (accountype == "1") { Get.toNamed(RouteName.tellusindividualscreen, - arguments: {'pageroute': "mainscreen"}); + // arguments: {'pageroute': "mainscreen"} + ); } else if (accountype == "2") { Get.toNamed(RouteName.tellusbusinessscreen, - arguments: {'pageroute': "mainscreen"}); + // arguments: {'pageroute': "mainscreen"} + ); } } else { Get.toNamed(RouteName.mainscreen);