forex
This commit is contained in:
parent
7f448d3e2f
commit
c61183c472
@ -93,11 +93,13 @@ class _groupState extends State<Group> {
|
|||||||
String? bodyStringColor = await getBodyColor();
|
String? bodyStringColor = await getBodyColor();
|
||||||
|
|
||||||
setState(() {
|
setState(() {
|
||||||
layoutColor = layoutString != null
|
layoutColor =
|
||||||
|
layoutString != null
|
||||||
? Color(int.parse(layoutString))
|
? Color(int.parse(layoutString))
|
||||||
: Colors.redAccent;
|
: Colors.redAccent;
|
||||||
|
|
||||||
bodyColor = bodyStringColor != null
|
bodyColor =
|
||||||
|
bodyStringColor != null
|
||||||
? Color(int.parse(bodyStringColor))
|
? Color(int.parse(bodyStringColor))
|
||||||
: Colors.white;
|
: Colors.white;
|
||||||
});
|
});
|
||||||
@ -154,10 +156,7 @@ class _groupState extends State<Group> {
|
|||||||
errorMessages.clear(); // Reset errors
|
errorMessages.clear(); // Reset errors
|
||||||
|
|
||||||
// Required fields that must not be empty
|
// Required fields that must not be empty
|
||||||
List<String> requiredFields = [
|
List<String> requiredFields = ["name", "description"];
|
||||||
"name",
|
|
||||||
"description",
|
|
||||||
];
|
|
||||||
|
|
||||||
// Check validation for each field
|
// Check validation for each field
|
||||||
for (String field in requiredFields) {
|
for (String field in requiredFields) {
|
||||||
@ -165,6 +164,14 @@ class _groupState extends State<Group> {
|
|||||||
errorMessages[field] = "Required";
|
errorMessages[field] = "Required";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// ✅ At least one of the two policies must be selected
|
||||||
|
if ((selectedDomestic == null || selectedDomestic!.isEmpty) &&
|
||||||
|
(selectedInternational == null || selectedInternational!.isEmpty)) {
|
||||||
|
errorMessages["domestic_policy_id"] = "Select at least one policy";
|
||||||
|
errorMessages["international_policy_id"] = "Select at least one policy";
|
||||||
|
}
|
||||||
|
|
||||||
|
return errorMessages.isEmpty;
|
||||||
|
|
||||||
return errorMessages.isEmpty; // Valid if there are no errors
|
return errorMessages.isEmpty; // Valid if there are no errors
|
||||||
}
|
}
|
||||||
@ -223,7 +230,8 @@ class _groupState extends State<Group> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final response = await (isEdit
|
final response =
|
||||||
|
await (isEdit
|
||||||
? http.put(
|
? http.put(
|
||||||
Uri.parse(apiUrlData),
|
Uri.parse(apiUrlData),
|
||||||
headers: {
|
headers: {
|
||||||
@ -320,8 +328,10 @@ class _groupState extends State<Group> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return ResponsiveBuilder(builder: (context, sizingInfo) {
|
return ResponsiveBuilder(
|
||||||
bool isDesktop = sizingInfo.deviceScreenType == DeviceScreenType.desktop;
|
builder: (context, sizingInfo) {
|
||||||
|
bool isDesktop =
|
||||||
|
sizingInfo.deviceScreenType == DeviceScreenType.desktop;
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
// backgroundColor: Colors.white,
|
// backgroundColor: Colors.white,
|
||||||
@ -329,23 +339,27 @@ class _groupState extends State<Group> {
|
|||||||
appBar: CustomAppBar(isDesktop: isDesktop),
|
appBar: CustomAppBar(isDesktop: isDesktop),
|
||||||
drawer: CustomDrawer(isDesktop: false),
|
drawer: CustomDrawer(isDesktop: false),
|
||||||
body: Padding(
|
body: Padding(
|
||||||
padding: isDesktop
|
padding:
|
||||||
|
isDesktop
|
||||||
? EdgeInsets.symmetric(
|
? EdgeInsets.symmetric(
|
||||||
horizontal: MediaQuery.of(context).size.width *
|
horizontal:
|
||||||
|
MediaQuery.of(context).size.width *
|
||||||
0.1, // 30% of screen width as horizontal padding
|
0.1, // 30% of screen width as horizontal padding
|
||||||
vertical: MediaQuery.of(context).size.height *
|
vertical:
|
||||||
|
MediaQuery.of(context).size.height *
|
||||||
0, // 5% of screen height as vertical padding
|
0, // 5% of screen height as vertical padding
|
||||||
)
|
)
|
||||||
: EdgeInsets.all(8),
|
: EdgeInsets.all(8),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
// if (isDesktop) CustomDrawer(isDesktop: true),
|
// if (isDesktop) CustomDrawer(isDesktop: true),
|
||||||
Expanded(child: buildData(isDesktop, context))
|
Expanded(child: buildData(isDesktop, context)),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
});
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget buildData(bool isDesktop, context) {
|
Widget buildData(bool isDesktop, context) {
|
||||||
@ -367,7 +381,8 @@ class _groupState extends State<Group> {
|
|||||||
Container(
|
Container(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
padding: const EdgeInsets.all(8.0),
|
padding: const EdgeInsets.all(8.0),
|
||||||
child: isDesktop
|
child:
|
||||||
|
isDesktop
|
||||||
? Row(
|
? Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.end,
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
children: _buildSubmit(isDesktop),
|
children: _buildSubmit(isDesktop),
|
||||||
@ -387,7 +402,8 @@ class _groupState extends State<Group> {
|
|||||||
// margin: isDesktop
|
// margin: isDesktop
|
||||||
// ? EdgeInsets.all(10.0)
|
// ? EdgeInsets.all(10.0)
|
||||||
// : EdgeInsets.only(left: 20.0, bottom: 20.0, top: 10.0, right: 20.0),
|
// : EdgeInsets.only(left: 20.0, bottom: 20.0, top: 10.0, right: 20.0),
|
||||||
height: isDesktop
|
height:
|
||||||
|
isDesktop
|
||||||
? MediaQuery.of(context).size.height * 0.98
|
? MediaQuery.of(context).size.height * 0.98
|
||||||
: MediaQuery.of(context).size.height,
|
: MediaQuery.of(context).size.height,
|
||||||
// decoration: BoxDecoration(
|
// decoration: BoxDecoration(
|
||||||
@ -414,10 +430,7 @@ class _groupState extends State<Group> {
|
|||||||
child: Row(
|
child: Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text("Create Group", style: GoogleFonts.poppins(fontSize: 18)),
|
||||||
"Create Group",
|
|
||||||
style: GoogleFonts.poppins(fontSize: 18),
|
|
||||||
),
|
|
||||||
// Container(
|
// Container(
|
||||||
// color: Color(0xFFE9EBF6),
|
// color: Color(0xFFE9EBF6),
|
||||||
// child: IconButton(
|
// child: IconButton(
|
||||||
@ -466,9 +479,7 @@ class _groupState extends State<Group> {
|
|||||||
children: _buildFirstRow(isDesktop),
|
children: _buildFirstRow(isDesktop),
|
||||||
),
|
),
|
||||||
|
|
||||||
SizedBox(
|
SizedBox(height: 10),
|
||||||
height: 10,
|
|
||||||
),
|
|
||||||
|
|
||||||
isDesktop
|
isDesktop
|
||||||
? Row(
|
? Row(
|
||||||
@ -482,7 +493,8 @@ class _groupState extends State<Group> {
|
|||||||
|
|
||||||
// SizedBox(height: 15),
|
// SizedBox(height: 15),
|
||||||
],
|
],
|
||||||
)),
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@ -498,13 +510,15 @@ class _groupState extends State<Group> {
|
|||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74)),
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldWrapper(
|
CustomTextFieldWrapper(
|
||||||
isFocused: false,
|
isFocused: false,
|
||||||
isDesktop: isDesktop,
|
isDesktop: isDesktop,
|
||||||
width: isDesktop
|
width:
|
||||||
|
isDesktop
|
||||||
? MediaQuery.of(context).size.width * 0.34
|
? MediaQuery.of(context).size.width * 0.34
|
||||||
: MediaQuery.of(context).size.width * 0.85,
|
: MediaQuery.of(context).size.width * 0.85,
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
@ -542,13 +556,15 @@ class _groupState extends State<Group> {
|
|||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74)),
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldWrapper(
|
CustomTextFieldWrapper(
|
||||||
isFocused: false,
|
isFocused: false,
|
||||||
isDesktop: isDesktop,
|
isDesktop: isDesktop,
|
||||||
width: isDesktop
|
width:
|
||||||
|
isDesktop
|
||||||
? MediaQuery.of(context).size.width * 0.34
|
? MediaQuery.of(context).size.width * 0.34
|
||||||
: MediaQuery.of(context).size.width * 0.85,
|
: MediaQuery.of(context).size.width * 0.85,
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
@ -591,18 +607,21 @@ class _groupState extends State<Group> {
|
|||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74)),
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldWrapper(
|
CustomTextFieldWrapper(
|
||||||
isFocused: false,
|
isFocused: false,
|
||||||
isDesktop: isDesktop,
|
isDesktop: isDesktop,
|
||||||
width: isDesktop
|
width:
|
||||||
|
isDesktop
|
||||||
? MediaQuery.of(context).size.width * 0.34
|
? MediaQuery.of(context).size.width * 0.34
|
||||||
: MediaQuery.of(context).size.width * 0.85,
|
: MediaQuery.of(context).size.width * 0.85,
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
height: 40,
|
height: 40,
|
||||||
child: apiForDomestic == null
|
child:
|
||||||
|
apiForDomestic == null
|
||||||
? Center(
|
? Center(
|
||||||
child: Transform.scale(
|
child: Transform.scale(
|
||||||
scale: 0.5,
|
scale: 0.5,
|
||||||
@ -610,12 +629,15 @@ class _groupState extends State<Group> {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
: DropdownSearch<String>(
|
: DropdownSearch<String>(
|
||||||
selectedItem: selectedDomestic == null
|
selectedItem:
|
||||||
|
selectedDomestic == null
|
||||||
? null
|
? null
|
||||||
: apiForDomestic!
|
: apiForDomestic!
|
||||||
.firstWhere((policy) =>
|
.firstWhere(
|
||||||
|
(policy) =>
|
||||||
policy['policy_id'] ==
|
policy['policy_id'] ==
|
||||||
selectedDomestic)['name']
|
selectedDomestic,
|
||||||
|
)['name']
|
||||||
.toString(),
|
.toString(),
|
||||||
popupProps: PopupProps.menu(
|
popupProps: PopupProps.menu(
|
||||||
showSearchBox: true,
|
showSearchBox: true,
|
||||||
@ -624,12 +646,14 @@ class _groupState extends State<Group> {
|
|||||||
searchFieldProps: TextFieldProps(
|
searchFieldProps: TextFieldProps(
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
hintText: "Search Policy...",
|
hintText: "Search Policy...",
|
||||||
contentPadding:
|
contentPadding: EdgeInsets.symmetric(
|
||||||
EdgeInsets.symmetric(horizontal: 10),
|
horizontal: 10,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
items: apiForDomestic!
|
),
|
||||||
|
items:
|
||||||
|
apiForDomestic!
|
||||||
.map((policy) => policy['name'].toString())
|
.map((policy) => policy['name'].toString())
|
||||||
.toList(),
|
.toList(),
|
||||||
dropdownDecoratorProps: DropDownDecoratorProps(
|
dropdownDecoratorProps: DropDownDecoratorProps(
|
||||||
@ -638,7 +662,8 @@ class _groupState extends State<Group> {
|
|||||||
contentPadding: EdgeInsets.symmetric(horizontal: 1),
|
contentPadding: EdgeInsets.symmetric(horizontal: 1),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
dropdownBuilder: (context, selectedItem) => Align(
|
dropdownBuilder:
|
||||||
|
(context, selectedItem) => Align(
|
||||||
alignment: Alignment.centerLeft,
|
alignment: Alignment.centerLeft,
|
||||||
child: Text(
|
child: Text(
|
||||||
selectedItem ?? "Select",
|
selectedItem ?? "Select",
|
||||||
@ -647,14 +672,15 @@ class _groupState extends State<Group> {
|
|||||||
),
|
),
|
||||||
onChanged: (String? newValue) {
|
onChanged: (String? newValue) {
|
||||||
setState(() {
|
setState(() {
|
||||||
selectedDomestic = apiForDomestic!.firstWhere(
|
selectedDomestic =
|
||||||
(policy) =>
|
apiForDomestic!.firstWhere(
|
||||||
policy['name'] == newValue)['policy_id'];
|
(policy) => policy['name'] == newValue,
|
||||||
|
)['policy_id'];
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
Column(
|
Column(
|
||||||
@ -665,18 +691,21 @@ class _groupState extends State<Group> {
|
|||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74)),
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldWrapper(
|
CustomTextFieldWrapper(
|
||||||
isFocused: false,
|
isFocused: false,
|
||||||
isDesktop: isDesktop,
|
isDesktop: isDesktop,
|
||||||
width: isDesktop
|
width:
|
||||||
|
isDesktop
|
||||||
? MediaQuery.of(context).size.width * 0.34
|
? MediaQuery.of(context).size.width * 0.34
|
||||||
: MediaQuery.of(context).size.width * 0.85,
|
: MediaQuery.of(context).size.width * 0.85,
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
height: 40,
|
height: 40,
|
||||||
child: apiForInternational == null
|
child:
|
||||||
|
apiForInternational == null
|
||||||
? Center(
|
? Center(
|
||||||
child: Transform.scale(
|
child: Transform.scale(
|
||||||
scale: 0.5,
|
scale: 0.5,
|
||||||
@ -684,12 +713,15 @@ class _groupState extends State<Group> {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
: DropdownSearch<String>(
|
: DropdownSearch<String>(
|
||||||
selectedItem: selectedInternational == null
|
selectedItem:
|
||||||
|
selectedInternational == null
|
||||||
? null
|
? null
|
||||||
: apiForInternational!
|
: apiForInternational!
|
||||||
.firstWhere((policy) =>
|
.firstWhere(
|
||||||
|
(policy) =>
|
||||||
policy['policy_id'] ==
|
policy['policy_id'] ==
|
||||||
selectedInternational)['name']
|
selectedInternational,
|
||||||
|
)['name']
|
||||||
.toString(),
|
.toString(),
|
||||||
popupProps: PopupProps.menu(
|
popupProps: PopupProps.menu(
|
||||||
showSearchBox: true,
|
showSearchBox: true,
|
||||||
@ -698,12 +730,14 @@ class _groupState extends State<Group> {
|
|||||||
searchFieldProps: TextFieldProps(
|
searchFieldProps: TextFieldProps(
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
hintText: "Search Policy...",
|
hintText: "Search Policy...",
|
||||||
contentPadding:
|
contentPadding: EdgeInsets.symmetric(
|
||||||
EdgeInsets.symmetric(horizontal: 10),
|
horizontal: 10,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
items: apiForInternational!
|
),
|
||||||
|
items:
|
||||||
|
apiForInternational!
|
||||||
.map((policy) => policy['name'].toString())
|
.map((policy) => policy['name'].toString())
|
||||||
.toList(),
|
.toList(),
|
||||||
dropdownDecoratorProps: DropDownDecoratorProps(
|
dropdownDecoratorProps: DropDownDecoratorProps(
|
||||||
@ -712,7 +746,8 @@ class _groupState extends State<Group> {
|
|||||||
contentPadding: EdgeInsets.symmetric(horizontal: 1),
|
contentPadding: EdgeInsets.symmetric(horizontal: 1),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
dropdownBuilder: (context, selectedItem) => Align(
|
dropdownBuilder:
|
||||||
|
(context, selectedItem) => Align(
|
||||||
alignment: Alignment.centerLeft,
|
alignment: Alignment.centerLeft,
|
||||||
child: Text(
|
child: Text(
|
||||||
selectedItem ?? "Select",
|
selectedItem ?? "Select",
|
||||||
@ -721,14 +756,15 @@ class _groupState extends State<Group> {
|
|||||||
),
|
),
|
||||||
onChanged: (String? newValue) {
|
onChanged: (String? newValue) {
|
||||||
setState(() {
|
setState(() {
|
||||||
selectedInternational = apiForInternational!
|
selectedInternational =
|
||||||
.firstWhere((policy) =>
|
apiForInternational!.firstWhere(
|
||||||
policy['name'] == newValue)['policy_id'];
|
(policy) => policy['name'] == newValue,
|
||||||
|
)['policy_id'];
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
];
|
];
|
||||||
@ -749,10 +785,9 @@ class _groupState extends State<Group> {
|
|||||||
onPressed: () {
|
onPressed: () {
|
||||||
context.go('/group');
|
context.go('/group');
|
||||||
},
|
},
|
||||||
child: Text("Cancel")),
|
child: Text("Cancel"),
|
||||||
SizedBox(
|
|
||||||
width: 20,
|
|
||||||
),
|
),
|
||||||
|
SizedBox(width: 20),
|
||||||
MouseRegion(
|
MouseRegion(
|
||||||
// cursor: widget.isViewMode
|
// cursor: widget.isViewMode
|
||||||
// ? SystemMouseCursors.forbidden
|
// ? SystemMouseCursors.forbidden
|
||||||
@ -773,7 +808,7 @@ class _groupState extends State<Group> {
|
|||||||
onPressed: handleSubmit, // Disable when in view mode
|
onPressed: handleSubmit, // Disable when in view mode
|
||||||
child: Text("Submit"),
|
child: Text("Submit"),
|
||||||
),
|
),
|
||||||
)
|
),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -53,6 +53,7 @@ class _ForexScreenState extends State<ForexScreen> {
|
|||||||
|
|
||||||
int fifteenPercent = 0;
|
int fifteenPercent = 0;
|
||||||
int remainingAmount = 0;
|
int remainingAmount = 0;
|
||||||
|
bool isWidget = false;
|
||||||
|
|
||||||
Map<String, FocusNode> focusNodes = {};
|
Map<String, FocusNode> focusNodes = {};
|
||||||
Map<String, bool> focusStates = {};
|
Map<String, bool> focusStates = {};
|
||||||
@ -419,12 +420,16 @@ class _ForexScreenState extends State<ForexScreen> {
|
|||||||
selectedCashPercent = int.tryParse(
|
selectedCashPercent = int.tryParse(
|
||||||
widget.selectedItem!["cash_percentage"]?.toString() ?? "",
|
widget.selectedItem!["cash_percentage"]?.toString() ?? "",
|
||||||
);
|
);
|
||||||
|
|
||||||
|
print("selectedCashPercentUPdae - $selectedCashPercent");
|
||||||
selectedPerdiemAmount = widget.selectedItem!["perdiem_amount"] as String?;
|
selectedPerdiemAmount = widget.selectedItem!["perdiem_amount"] as String?;
|
||||||
isChecked =
|
isChecked =
|
||||||
widget.selectedItem!["have_card"] == "1"; // Convert string to bool
|
widget.selectedItem!["have_card"] == "1"; // Convert string to bool
|
||||||
textControllers["_cardNumber"]?.text =
|
textControllers["_cardNumber"]?.text =
|
||||||
widget.selectedItem!["card_number"]?.toString() ?? "";
|
widget.selectedItem!["card_number"]?.toString() ?? "";
|
||||||
|
|
||||||
|
isWidget = true;
|
||||||
|
|
||||||
// if (textControllers["_cardNumber"] != null) {
|
// if (textControllers["_cardNumber"] != null) {
|
||||||
// print("userCardNumber11 - $userCardNumber");
|
// print("userCardNumber11 - $userCardNumber");
|
||||||
// textControllers["_cardNumber"]!.text = userCardNumber ?? '';
|
// textControllers["_cardNumber"]!.text = userCardNumber ?? '';
|
||||||
@ -548,6 +553,13 @@ class _ForexScreenState extends State<ForexScreen> {
|
|||||||
|
|
||||||
selectedQuotedAmount =
|
selectedQuotedAmount =
|
||||||
((perdiemAmount + calclateVal).toString() ?? 0) as String?;
|
((perdiemAmount + calclateVal).toString() ?? 0) as String?;
|
||||||
|
|
||||||
|
if (isWidget) {
|
||||||
|
print("IsWidget Update");
|
||||||
|
|
||||||
|
int? quotedAmount = int.tryParse(selectedQuotedAmount!);
|
||||||
|
fifteenPercent = (quotedAmount! * selectedCashPercent!) ~/ 100;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (userEdited) {
|
if (userEdited) {
|
||||||
@ -612,7 +624,8 @@ class _ForexScreenState extends State<ForexScreen> {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (enteredAmount == null || calculateAmnt > qouteAmount!) {
|
if (enteredAmount == null || calculateAmnt > qouteAmount!) {
|
||||||
errorMessages["deposit_on_card"] = "Amount cannot exceed $qouteAmount";
|
errorMessages["deposit_on_card"] =
|
||||||
|
"Sum of cash card cannot exceed $qouteAmount";
|
||||||
} else if (checkValidAmount < qouteAmount) {
|
} else if (checkValidAmount < qouteAmount) {
|
||||||
errorMessages["deposit_on_card"] =
|
errorMessages["deposit_on_card"] =
|
||||||
"Enter Valid Amount"; // Clear error if valid
|
"Enter Valid Amount"; // Clear error if valid
|
||||||
@ -627,6 +640,7 @@ class _ForexScreenState extends State<ForexScreen> {
|
|||||||
void _validateCashAmount(String value) {
|
void _validateCashAmount(String value) {
|
||||||
// errorMessages["deposit_on_card"] = " ";
|
// errorMessages["deposit_on_card"] = " ";
|
||||||
errorMessages.remove("deposit_on_cash");
|
errorMessages.remove("deposit_on_cash");
|
||||||
|
|
||||||
print("_validateCashAmount - $value - $fifteenPercent");
|
print("_validateCashAmount - $value - $fifteenPercent");
|
||||||
|
|
||||||
int? enteredAmount = int.tryParse(value);
|
int? enteredAmount = int.tryParse(value);
|
||||||
@ -652,6 +666,7 @@ class _ForexScreenState extends State<ForexScreen> {
|
|||||||
errorMessages["deposit_on_card"] =
|
errorMessages["deposit_on_card"] =
|
||||||
"Enter Valid Amount"; // Clear error if valid
|
"Enter Valid Amount"; // Clear error if valid
|
||||||
}
|
}
|
||||||
|
print("CASHfifteenPercent - $fifteenPercent");
|
||||||
errorMessages["deposit_on_cash"] = "Amount cannot exceed $fifteenPercent";
|
errorMessages["deposit_on_cash"] = "Amount cannot exceed $fifteenPercent";
|
||||||
} else if (checkValidAmount == quotedAmount) {
|
} else if (checkValidAmount == quotedAmount) {
|
||||||
errorMessages.remove("deposit_on_cash");
|
errorMessages.remove("deposit_on_cash");
|
||||||
@ -1688,7 +1703,9 @@ class _ForexScreenState extends State<ForexScreen> {
|
|||||||
errorMessages.remove("deposit_on_cash");
|
errorMessages.remove("deposit_on_cash");
|
||||||
errorMessages.remove("deposit_on_card");
|
errorMessages.remove("deposit_on_card");
|
||||||
// errorMessages["deposit_on_card"] = "";
|
// errorMessages["deposit_on_card"] = "";
|
||||||
|
setState(() {
|
||||||
|
userEdited = true;
|
||||||
|
});
|
||||||
_validateCashAmount(
|
_validateCashAmount(
|
||||||
value,
|
value,
|
||||||
); // Call validation when text changes
|
); // Call validation when text changes
|
||||||
@ -1744,6 +1761,7 @@ class _ForexScreenState extends State<ForexScreen> {
|
|||||||
onChanged: (value) {
|
onChanged: (value) {
|
||||||
errorMessages.remove("deposit_on_cash");
|
errorMessages.remove("deposit_on_cash");
|
||||||
errorMessages.remove("deposit_on_card");
|
errorMessages.remove("deposit_on_card");
|
||||||
|
userEdited = true;
|
||||||
_validateCardAmount(
|
_validateCardAmount(
|
||||||
value,
|
value,
|
||||||
); // Call validation when text changes
|
); // Call validation when text changes
|
||||||
|
|||||||
@ -409,10 +409,13 @@ class _FlightListWidgetState extends State<FlightListWidget> {
|
|||||||
fontWeight: FontWeight.w700,
|
fontWeight: FontWeight.w700,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Image.asset(
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(left: 10),
|
||||||
|
child: Image.asset(
|
||||||
'assets/images/IconsImg/alternate.png',
|
'assets/images/IconsImg/alternate.png',
|
||||||
width: 25,
|
width: 20,
|
||||||
height: 25,
|
height: 20,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
Text(
|
Text(
|
||||||
"$toPlaceCountry",
|
"$toPlaceCountry",
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user