kishan.bhuta/Regroup
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

conflicts for tell us page resolved

Browse Source
This commit is contained in:
Shubhamshirva
2024-07-12 19:33:07 +05:30
parent 3e8b1ee1de
commit df11515d6b
5 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Login/ViewModel/LoginApi.dart
View File

@@ -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 {

10
lib/onboarding/Signup/View/Business/View/tellusbusiness.dart
View File

@@ -46,7 +46,7 @@ class _TellusaboutBusinessState extends State<TellusaboutBusiness> {
});
}
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<TellusaboutBusiness> {
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(

10
lib/onboarding/Signup/View/Individual/tellusindividual.dart
View File

@@ -36,7 +36,7 @@ class _TellusaboutIndividualState extends State<TellusaboutIndividual> {
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<TellusaboutIndividual> {
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);

12
lib/onboarding/Signup/View/verifyuser.dart
View File

@@ -55,16 +55,16 @@ class _VerifyuserScreenStateState extends State<VerifyuserScreenState> {
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"
// }
);
}

12
lib/onboarding/SplashScreen.dart
View File

@@ -100,10 +100,12 @@ class _SplashScreenState extends State<SplashScreen> {
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<SplashScreen> {
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);