Skip to content

GitLab

Commit b7f79d62 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

30-06-2025 By Sai Srinivas 

Finance And Common Module.
parent 1a2ae52a
Expand all Hide whitespace changes
Inline Side-by-side
lib/Models/financeModels/paymentRequestionBankDetailsResponse.dart 0 → 100644
View file @ b7f79d62
class paymentRequestionBankDetailsResponse {
GetDetails? getDetails;
String? error;
String? message;
paymentRequestionBankDetailsResponse({this.getDetails, this.error, this.message});
paymentRequestionBankDetailsResponse.fromJson(Map<String, dynamic> json) {
getDetails = json['get_details'] != null
? new GetDetails.fromJson(json['get_details'])
: null;
error = json['error'];
message = json['message'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.getDetails != null) {
data['get_details'] = this.getDetails!.toJson();
}
data['error'] = this.error;
data['message'] = this.message;
return data;
}
}
class GetDetails {
String? id;
String? name;
String? bankName;
String? bankBranchName;
String? bankIfscCode;
String? bankAccountHolderName;
String? bankAccountNumber;
String? bankUpiId;
GetDetails(
{this.id,
this.name,
this.bankName,
this.bankBranchName,
this.bankIfscCode,
this.bankAccountHolderName,
this.bankAccountNumber,
this.bankUpiId});
GetDetails.fromJson(Map<String, dynamic> json) {
id = json['id'];
name = json['name'];
bankName = json['bank_name'];
bankBranchName = json['bank_branch_name'];
bankIfscCode = json['bank_ifsc_code'];
bankAccountHolderName = json['bank_account_holder_name'];
bankAccountNumber = json['bank_account_number'];
bankUpiId = json['bank_upi_id'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['name'] = this.name;
data['bank_name'] = this.bankName;
data['bank_branch_name'] = this.bankBranchName;
data['bank_ifsc_code'] = this.bankIfscCode;
data['bank_account_holder_name'] = this.bankAccountHolderName;
data['bank_account_number'] = this.bankAccountNumber;
data['bank_upi_id'] = this.bankUpiId;
return data;
}
}
lib/Notifiers/commonProvider/accountsListProvider.dart
View file @ b7f79d62
...@@ -338,21 +338,6 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -338,21 +338,6 @@ class Accountslistprovider extends ChangeNotifier {
} }
} }
void checkAdditionalDetailsFilled() {
hasFilledAdditionalDetails = bankNameController.text.trim().isNotEmpty &&
branchNameController.text.trim().isNotEmpty &&
bankIfscCotroller.text.trim().isNotEmpty &&
bankHolderNameController.text.trim().isNotEmpty &&
bankAcNumberController.text.trim().isNotEmpty &&
bankUpiController.text.trim().isNotEmpty &&
contactPersonController.text.trim().isNotEmpty &&
contectPersonDesignationController.text.trim().isNotEmpty &&
contectPersonAltMobController.text.trim().isNotEmpty;
// && contectPersonTeleController.text.trim().isNotEmpty
// && contectPersonMailController.text.trim().isNotEmpty;
notifyListeners();
}
bool validatereceiptForm(BuildContext context) { bool validatereceiptForm(BuildContext context) {
accountError = null; accountError = null;
nameError = null; nameError = null;
...@@ -386,86 +371,87 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -386,86 +371,87 @@ class Accountslistprovider extends ChangeNotifier {
mobileError = "Please Enter Mobile Number"; mobileError = "Please Enter Mobile Number";
isValid = false; isValid = false;
} }
//
if (_selectedState == null || _selectedStateID!.isEmpty) { //
stateError = "Please select a State"; // if (!_isVisible && !hasFilledAdditionalDetails) {
isValid = false; // addMoreDetailsError = "Please Add More Details to Continue";
} // isValid = false;
if (_selectedDistricts == null || _selectedDistrictID!.isEmpty) { // }
districtError = "Please select a District"; // if(_isVisible) {
isValid = false; //
} // if (_selectedState == null || _selectedStateID!.isEmpty) {
if (_selectedSubLocations == null || _selectedSubLocID!.isEmpty) { // stateError = "Please select a State";
localityError = "Please select a Locality"; // isValid = false;
isValid = false; // }
} // if (_selectedDistricts == null || _selectedDistrictID!.isEmpty) {
if (addressController.text.trim().isEmpty) { // districtError = "Please select a District";
addressError = "Please Enter an Address"; // isValid = false;
isValid = false; // }
} // if (_selectedSubLocations == null || _selectedSubLocID!.isEmpty) {
checkAdditionalDetailsFilled(); // localityError = "Please select a Locality";
if (!_isVisible && !hasFilledAdditionalDetails) { // isValid = false;
addMoreDetailsError = "Please Add More Details to Continue"; // }
isValid = false; // if (addressController.text.trim().isEmpty) {
} // addressError = "Please Enter an Address";
if(_isVisible) { // isValid = false;
if (bankNameController.text // }
.trim() // if (bankNameController.text
.isEmpty) { // .trim()
banknameError = "Please Enter a Bank Name"; // .isEmpty) {
isValid = false; // banknameError = "Please Enter a Bank Name";
} // isValid = false;
// }
if (branchNameController.text //
.trim() // if (branchNameController.text
.isEmpty) { // .trim()
bankBranchError = "Please Enter Branch Name"; // .isEmpty) {
isValid = false; // bankBranchError = "Please Enter Branch Name";
} // isValid = false;
if (bankIfscCotroller.text // }
.trim() // if (bankIfscCotroller.text
.isEmpty) { // .trim()
bankIFSCError = "Please Enter Bank IFSC"; // .isEmpty) {
isValid = false; // bankIFSCError = "Please Enter Bank IFSC";
} // isValid = false;
if (bankHolderNameController.text // }
.trim() // if (bankHolderNameController.text
.isEmpty) { // .trim()
bankHolderNameError = "Please Enter Account Holder Name"; // .isEmpty) {
isValid = false; // bankHolderNameError = "Please Enter Account Holder Name";
} // isValid = false;
if (bankAcNumberController.text // }
.trim() // if (bankAcNumberController.text
.isEmpty) { // .trim()
bankAcNumberError = "Please Enter Bank Account Number"; // .isEmpty) {
isValid = false; // bankAcNumberError = "Please Enter Bank Account Number";
} // isValid = false;
if (bankUpiController.text // }
.trim() // if (bankUpiController.text
.isEmpty) { // .trim()
upiError = "Please Enter UPI ID"; // .isEmpty) {
isValid = false; // upiError = "Please Enter UPI ID";
} // isValid = false;
if (contactPersonController.text // }
.trim() // if (contactPersonController.text
.isEmpty) { // .trim()
contactPersonError = "Please Enter Contact Person Name"; // .isEmpty) {
isValid = false; // contactPersonError = "Please Enter Contact Person Name";
} // isValid = false;
if (contectPersonDesignationController.text // }
.trim() // if (contectPersonDesignationController.text
.isEmpty) { // .trim()
desigantionError = "Please Enter Designation"; // .isEmpty) {
isValid = false; // desigantionError = "Please Enter Designation";
} // isValid = false;
if (contectPersonAltMobController.text // }
.trim() // if (contectPersonAltMobController.text
.isEmpty) { // .trim()
altMobError = "Please Enter Mobile Number"; // .isEmpty) {
isValid = false; // altMobError = "Please Enter Mobile Number";
} // isValid = false;
// }
} //
// }
// if (contectPersonTeleController.text.trim().isEmpty) { // if (contectPersonTeleController.text.trim().isEmpty) {
...@@ -495,65 +481,65 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -495,65 +481,65 @@ class Accountslistprovider extends ChangeNotifier {
void updateBankName(String value) { void updateBankName(String value) {
banknameError = null; banknameError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
void updateBankBranch(String value) { void updateBankBranch(String value) {
bankBranchError = null; bankBranchError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
void updateIFSC(String value) { void updateIFSC(String value) {
bankIFSCError = null; bankIFSCError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
void updateHolder(String value) { void updateHolder(String value) {
bankHolderNameError = null; bankHolderNameError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
void updateNumber(String value) { void updateNumber(String value) {
bankAcNumberError = null; bankAcNumberError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
void updateUPI(String value) { void updateUPI(String value) {
upiError = null; upiError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
void updateContactPerson(String value){ void updateContactPerson(String value){
contactPersonError = null; contactPersonError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
void updateDesignation(String value){ void updateDesignation(String value){
desigantionError = null; desigantionError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
void updateAltMobile(String value){ void updateAltMobile(String value){
altMobError = null; altMobError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
void updateTeleMobile(String value){ void updateTeleMobile(String value){
teleError = null; teleError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
void updateMail(String value){ void updateMail(String value){
mailError = null; mailError = null;
checkAdditionalDetailsFilled();
notifyListeners(); notifyListeners();
} }
......
lib/Notifiers/financeProvider/RequesitionLidtDetailsProvider.dart
View file @ b7f79d62
...@@ -15,6 +15,7 @@ import 'approveRejectPaymentRequestResponse.dart'; ...@@ -15,6 +15,7 @@ import 'approveRejectPaymentRequestResponse.dart';
class Requesitionlidtdetailsprovider extends ChangeNotifier { class Requesitionlidtdetailsprovider extends ChangeNotifier {
TextEditingController requestedAmount = TextEditingController(); TextEditingController requestedAmount = TextEditingController();
TextEditingController proposedPaymentAccount = TextEditingController(); TextEditingController proposedPaymentAccount = TextEditingController();
TextEditingController approvedAmount = TextEditingController();
TextEditingController accountName = TextEditingController(); TextEditingController accountName = TextEditingController();
TextEditingController branch = TextEditingController(); TextEditingController branch = TextEditingController();
TextEditingController requestingPurpose = TextEditingController(); TextEditingController requestingPurpose = TextEditingController();
...@@ -182,6 +183,7 @@ class Requesitionlidtdetailsprovider extends ChangeNotifier { ...@@ -182,6 +183,7 @@ class Requesitionlidtdetailsprovider extends ChangeNotifier {
"Level 1 Approved By", "Level 1 Approved By",
"Level 2 Remarks", "Level 2 Remarks",
"Level 2 Approved By", "Level 2 Approved By",
"Approved Amount",
"Created Date/Time", "Created Date/Time",
"Updated Date/Time", "Updated Date/Time",
]; ];
...@@ -260,6 +262,7 @@ class Requesitionlidtdetailsprovider extends ChangeNotifier { ...@@ -260,6 +262,7 @@ class Requesitionlidtdetailsprovider extends ChangeNotifier {
_requestDetails.level1Employee ?? "-", _requestDetails.level1Employee ?? "-",
_requestDetails.level2ApprovalRemarks ?? "-", _requestDetails.level2ApprovalRemarks ?? "-",
_requestDetails.level2Employee ?? "-", _requestDetails.level2Employee ?? "-",
_requestDetails.amount ?? "-",
_requestDetails.createdDatetime ?? "-", _requestDetails.createdDatetime ?? "-",
_requestDetails.updatedDatetime ?? "-", _requestDetails.updatedDatetime ?? "-",
]; ];
...@@ -276,6 +279,7 @@ class Requesitionlidtdetailsprovider extends ChangeNotifier { ...@@ -276,6 +279,7 @@ class Requesitionlidtdetailsprovider extends ChangeNotifier {
print("here 212ssass1"); print("here 212ssass1");
requestedAmount.text = _requestDetails.requestedAmount ?? "-"; requestedAmount.text = _requestDetails.requestedAmount ?? "-";
proposedPaymentAccount.text = _requestDetails.proposedAccount ?? "-"; proposedPaymentAccount.text = _requestDetails.proposedAccount ?? "-";
approvedAmount.text = _requestDetails.amount ?? "-";
accountName.text = _requestDetails.accountName ?? "-"; accountName.text = _requestDetails.accountName ?? "-";
branch.text = _requestDetails.branch ?? "-"; branch.text = _requestDetails.branch ?? "-";
requestingPurpose.text = _requestDetails.requestingPurpose ?? "-"; requestingPurpose.text = _requestDetails.requestingPurpose ?? "-";
...@@ -397,6 +401,7 @@ class Requesitionlidtdetailsprovider extends ChangeNotifier { ...@@ -397,6 +401,7 @@ class Requesitionlidtdetailsprovider extends ChangeNotifier {
resetAll() { resetAll() {
requestedAmount.clear(); requestedAmount.clear();
proposedPaymentAccount.clear(); proposedPaymentAccount.clear();
approvedAmount.clear();
accountName.clear(); accountName.clear();
branch.clear(); branch.clear();
requestingPurpose.clear(); requestingPurpose.clear();
......
lib/Notifiers/financeProvider/RequestionListProvider.dart
View file @ b7f79d62
...@@ -27,6 +27,8 @@ import 'package:pdf/pdf.dart'; ...@@ -27,6 +27,8 @@ import 'package:pdf/pdf.dart';
import 'package:pdf/widgets.dart' as pw; import 'package:pdf/widgets.dart' as pw;
import 'package:printing/printing.dart'; import 'package:printing/printing.dart';
import '../../Models/financeModels/paymentRequestionBankDetailsResponse.dart';
class Requestionlistprovider extends ChangeNotifier { class Requestionlistprovider extends ChangeNotifier {
TextEditingController reqPurposeController = TextEditingController(); TextEditingController reqPurposeController = TextEditingController();
TextEditingController descController = TextEditingController(); TextEditingController descController = TextEditingController();
...@@ -62,6 +64,8 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -62,6 +64,8 @@ class Requestionlistprovider extends ChangeNotifier {
DirectPaymentModes? _selectDirectPaymentModes; DirectPaymentModes? _selectDirectPaymentModes;
GetDetails _getBankDetails = GetDetails();
String _directAccountID = ""; String _directAccountID = "";
String _directAccountValue = ""; String _directAccountValue = "";
String _directPaymentAccountsID = ""; String _directPaymentAccountsID = "";
...@@ -74,6 +78,8 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -74,6 +78,8 @@ class Requestionlistprovider extends ChangeNotifier {
List<DirectPaymentAccounts> get directPaymentAccounts => List<DirectPaymentAccounts> get directPaymentAccounts =>
_directPaymentAccounts; _directPaymentAccounts;
GetDetails get getBankDetails => _getBankDetails;
List<DirectPaymentModes> get directPaymentModes => _directPaymentModes; List<DirectPaymentModes> get directPaymentModes => _directPaymentModes;
DirectAccounts? get selectDirectAccounts => _selectedDirectAccounts; DirectAccounts? get selectDirectAccounts => _selectedDirectAccounts;
...@@ -355,18 +361,56 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -355,18 +361,56 @@ class Requestionlistprovider extends ChangeNotifier {
homeProvider.session, homeProvider.session,
mode, mode,
); );
_accounts.clear();
_paymentModes.clear();
_requestingPurposes.clear();
notifyListeners();
if (data != null) { if (data != null) {
if (data.error == "0") { if (data.error == "0") {
_accounts = data.accounts??[]; _accounts = data.accounts??[];
if(mode=="self"&&data.accounts!.length==1){
print("1234234");
paymentRequestionBankDetailsAPIFunction(context, data.accounts!.first.id);
}
_paymentModes = data.paymentModes??[]; _paymentModes = data.paymentModes??[];
_requestingPurposes = data.requestingPurposes??[]; _requestingPurposes = data.requestingPurposes??[];
print('here'); print('here');
print(data.requestingPurposes); print(data.requestingPurposes);
print(_accounts); print(_accounts);
notifyListeners();
checkDropdownselected(); checkDropdownselected();
} else {}
}
} catch (e, s) {}
}
Future<void> paymentRequestionBankDetailsAPIFunction(context, account_id) async {
try {
var homeProvider = Provider.of<HomescreenNotifier>(
context,
listen: false,
);
final data = await ApiCalling.paymentRequestionBankDetailsAPI(
homeProvider.empId,
homeProvider.session,
account_id,
);
notifyListeners();
if (data != null) {
if (data.error == "0") {
_getBankDetails = data.getDetails!;
bankNameController.text = data.getDetails!.bankName??"-";
bankBranchController.text = data.getDetails!.bankBranchName??"-";
bankIfscController.text = data.getDetails!.bankIfscCode??"-";
bankAcHolderController.text = data.getDetails!.bankAccountHolderName??"-";
bankAccNumberController.text = data.getDetails!.bankAccountNumber??"-";
bankUpiController.text = data.getDetails!.bankUpiId??"-";
notifyListeners(); notifyListeners();
} else {} } else {}
} }
} catch (e, s) {} } catch (e, s) {}
......
lib/screens/HomeScreen.dart
View file @ b7f79d62
...@@ -172,7 +172,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -172,7 +172,7 @@ class _MyHomePageState extends State<MyHomePage> {
child: Column( child: Column(
children: [ children: [
Expanded( Expanded(
flex: 3, flex: 4,
child: Container( child: Container(
padding: EdgeInsets.symmetric(vertical: 10), padding: EdgeInsets.symmetric(vertical: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
...@@ -188,6 +188,10 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -188,6 +188,10 @@ class _MyHomePageState extends State<MyHomePage> {
right: 15, right: 15,
top: 30, top: 30,
), ),
padding: EdgeInsets.only(
bottom: 15,
),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
gradient: LinearGradient( gradient: LinearGradient(
...@@ -336,7 +340,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -336,7 +340,7 @@ class _MyHomePageState extends State<MyHomePage> {
), ),
), ),
Expanded( Expanded(
flex: 8, flex: 10,
child: Container( child: Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 20, left: 20,
......
lib/screens/commom/addCommonPayment.dart
View file @ b7f79d62
This diff is collapsed.
lib/screens/commom/commonDashboard.dart
View file @ b7f79d62
...@@ -109,7 +109,7 @@ class _CommondashboardState extends State<Commondashboard> { ...@@ -109,7 +109,7 @@ class _CommondashboardState extends State<Commondashboard> {
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
), ),
child: Text( child: Text(
"Add Common Account", "Add Account",
style: TextStyle( style: TextStyle(
fontSize: 15, fontSize: 15,
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
......
lib/screens/commom/transactionDetails.dart
View file @ b7f79d62
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:generp/Utils/app_colors.dart'; import 'package:generp/Utils/app_colors.dart';
import 'package:generp/Utils/commonWidgets.dart'; import 'package:generp/Utils/commonWidgets.dart';
import 'package:generp/screens/finance/FileViewer.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../Notifiers/financeProvider/paymentRequisitionPaymentsListProvider.dart'; import '../../Notifiers/financeProvider/paymentRequisitionPaymentsListProvider.dart';
...@@ -40,7 +41,7 @@ class _TransactiondetailsState extends State<Transactiondetails> { ...@@ -40,7 +41,7 @@ class _TransactiondetailsState extends State<Transactiondetails> {
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
body: SafeArea( body: SafeArea(
child: Container( child: Container(
margin: EdgeInsets.symmetric(vertical: 10,horizontal: 10), margin: EdgeInsets.symmetric(vertical: 10, horizontal: 10),
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 10), padding: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
...@@ -58,19 +59,19 @@ class _TransactiondetailsState extends State<Transactiondetails> { ...@@ -58,19 +59,19 @@ class _TransactiondetailsState extends State<Transactiondetails> {
flex: 1, flex: 1,
child: SizedBox( child: SizedBox(
child: child:
widget.type == "Credit" widget.type == "Credit"
? Image.asset( ? Image.asset(
"assets/images/trans_debit.png", "assets/images/trans_debit.png",
height: 45, height: 45,
width: 45, width: 45,
fit: BoxFit.contain, fit: BoxFit.contain,
) )
: Image.asset( : Image.asset(
"assets/images/trans_credit.png", "assets/images/trans_credit.png",
height: 45, height: 45,
width: 45, width: 45,
fit: BoxFit.contain, fit: BoxFit.contain,
), ),
), ),
), ),
SizedBox(width: 10), SizedBox(width: 10),
...@@ -99,7 +100,7 @@ class _TransactiondetailsState extends State<Transactiondetails> { ...@@ -99,7 +100,7 @@ class _TransactiondetailsState extends State<Transactiondetails> {
children: [ children: [
TextSpan( TextSpan(
text: text:
widget.type == "Credit" ? "-" : "+", widget.type == "Credit" ? "-" : "+",
style: TextStyle( style: TextStyle(
color: Color(0xFF2D2D2D), color: Color(0xFF2D2D2D),
fontSize: 13, fontSize: 13,
...@@ -124,21 +125,23 @@ class _TransactiondetailsState extends State<Transactiondetails> { ...@@ -124,21 +125,23 @@ class _TransactiondetailsState extends State<Transactiondetails> {
], ],
), ),
Divider(thickness: 0.5, color: Color(0xFFd7d7d7)), Divider(thickness: 0.5, color: Color(0xFFd7d7d7)),
...List.generate(5, (j) { ...List.generate(6, (j) {
final headings = [ final headings = [
"ID", "ID",
"Date", "Date",
"Account", "Account",
"Ref Type", "Ref Type",
"Description", "Payment Remarks",
"Attachment"
]; ];
final subHeadings = [ final subHeadings = [
details.id ?? "-", details.id ?? "-",
details.createdDatetime ?? "-", details.createdDatetime ?? "-",
details.accountName ?? "-", details.accountName ?? "-",
details.refType ?? "-", details.refType ?? "-",
details.description ?? "-", details.paymentRemarks ?? "-",
"View",
]; ];
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 5), padding: EdgeInsets.symmetric(vertical: 5),
...@@ -156,16 +159,48 @@ class _TransactiondetailsState extends State<Transactiondetails> { ...@@ -156,16 +159,48 @@ class _TransactiondetailsState extends State<Transactiondetails> {
), ),
), ),
SizedBox(width: 15), SizedBox(width: 15),
Expanded( if(subHeadings[j] == "View")...[
child: Text( Expanded(
subHeadings[j] ?? "-", child: InkResponse(
style: TextStyle( onTap: () async {
fontFamily: "JakartaMedium", Navigator.push(context, MaterialPageRoute(
fontSize: 14, builder: (context) =>
color: AppColors.grey_thick, Fileviewer(fileName: details
.attachmentViewFileName ?? "",
fileUrl: details
.attachmentDirFilePath ?? "")
,));
},
child: Text(
"${subHeadings[j]}" == ""
? "-"
: subHeadings[j] ?? "-",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.app_blue,
decorationColor: AppColors.app_blue,
decoration: TextDecoration.underline
),
),
), ),
), ),
), ] else
...[
Expanded(
child: Text(
"${subHeadings[j]}" == ""
? "-"
: subHeadings[j] ?? "-",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.grey_thick,
),
),
),
]
], ],
), ),
); );
......
lib/screens/finance/PaymentRequestionListDetails.dart
View file @ b7f79d62
...@@ -32,6 +32,7 @@ class Paymentrequestionlistdetails extends StatefulWidget { ...@@ -32,6 +32,7 @@ class Paymentrequestionlistdetails extends StatefulWidget {
class _PaymentrequestionlistdetailsState class _PaymentrequestionlistdetailsState
extends State<Paymentrequestionlistdetails> { extends State<Paymentrequestionlistdetails> {
List<FocusNode> focusNodes = List.generate(10, (index) => FocusNode(),);
Dropdowntheme ddtheme = Dropdowntheme(); Dropdowntheme ddtheme = Dropdowntheme();
TextEditingController approvedAmount = TextEditingController(); TextEditingController approvedAmount = TextEditingController();
TextEditingController remarks = TextEditingController(); TextEditingController remarks = TextEditingController();
...@@ -71,6 +72,13 @@ class _PaymentrequestionlistdetailsState ...@@ -71,6 +72,13 @@ class _PaymentrequestionlistdetailsState
}); });
} }
@override
void dispose() {
// TODO: implement dispose
focusNodes.map((e)=>e.dispose());
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Consumer<Requesitionlidtdetailsprovider>( return Consumer<Requesitionlidtdetailsprovider>(
...@@ -299,13 +307,15 @@ class _PaymentrequestionlistdetailsState ...@@ -299,13 +307,15 @@ class _PaymentrequestionlistdetailsState
), ),
); );
}), }),
SizedBox(height: 80,)
], ],
), ),
), ),
), ),
), ),
), ),
floatingActionButton: bottomNavigationBar:
(["admin", "self"].contains(widget.mode) || !shouldShowButtons) (["admin", "self"].contains(widget.mode) || !shouldShowButtons)
? Container(height: 0) ? Container(height: 0)
: Container( : Container(
...@@ -625,9 +635,12 @@ class _PaymentrequestionlistdetailsState ...@@ -625,9 +635,12 @@ class _PaymentrequestionlistdetailsState
approvedAmount, approvedAmount,
"Enter Approved Amount", "Enter Approved Amount",
(p0) {}, (p0) {},
TextInputType.number, TextInputType.numberWithOptions(),
false, false,
FilteringTextInputFormatter.digitsOnly, null,
focusNodes[0],
focusNodes[1],
TextInputAction.next
), ),
textControllerWidget( textControllerWidget(
context, context,
...@@ -637,6 +650,9 @@ class _PaymentrequestionlistdetailsState ...@@ -637,6 +650,9 @@ class _PaymentrequestionlistdetailsState
TextInputType.text, TextInputType.text,
false, false,
null, null,
focusNodes[1],
null,
TextInputAction.done
), ),
TextWidget(context, "Proposed Payment Account"), TextWidget(context, "Proposed Payment Account"),
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
...@@ -847,7 +863,7 @@ class _PaymentrequestionlistdetailsState ...@@ -847,7 +863,7 @@ class _PaymentrequestionlistdetailsState
textControllerReadonlyWidget( textControllerReadonlyWidget(
context, context,
provider.requestedAmount, provider.requestedAmount,
"Enter Requested Amount", "Requested Amount",
(p0) {}, (p0) {},
), ),
...@@ -859,6 +875,7 @@ class _PaymentrequestionlistdetailsState ...@@ -859,6 +875,7 @@ class _PaymentrequestionlistdetailsState
TextInputType.text, TextInputType.text,
false, false,
null, null,
focusNodes[2],null,TextInputAction.done
), ),
InkWell( InkWell(
onTap: () { onTap: () {
...@@ -956,6 +973,7 @@ class _PaymentrequestionlistdetailsState ...@@ -956,6 +973,7 @@ class _PaymentrequestionlistdetailsState
(p0) {}, (p0) {},
), ),
TextWidget(context, "Payment Account"), TextWidget(context, "Payment Account"),
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
child: Row( child: Row(
...@@ -1061,6 +1079,13 @@ class _PaymentrequestionlistdetailsState ...@@ -1061,6 +1079,13 @@ class _PaymentrequestionlistdetailsState
), ),
), ),
textControllerReadonlyWidget(
context,
provider.approvedAmount,
"Approved Amount",
(p0) {},
),
textControllerWidget( textControllerWidget(
context, context,
paymentReferenceNumber, paymentReferenceNumber,
...@@ -1069,6 +1094,7 @@ class _PaymentrequestionlistdetailsState ...@@ -1069,6 +1094,7 @@ class _PaymentrequestionlistdetailsState
TextInputType.text, TextInputType.text,
false, false,
null, null,
focusNodes[3],focusNodes[4],TextInputAction.next
), ),
textControllerWidget( textControllerWidget(
...@@ -1079,6 +1105,7 @@ class _PaymentrequestionlistdetailsState ...@@ -1079,6 +1105,7 @@ class _PaymentrequestionlistdetailsState
TextInputType.text, TextInputType.text,
false, false,
null, null,
focusNodes[4],null,TextInputAction.done
), ),
InkResponse( InkResponse(
......
lib/screens/finance/addPaymentReceiptList.dart
View file @ b7f79d62
...@@ -19,6 +19,7 @@ class Addpaymentreceiptlist extends StatefulWidget { ...@@ -19,6 +19,7 @@ class Addpaymentreceiptlist extends StatefulWidget {
class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
Dropdowntheme ddtheme = Dropdowntheme(); Dropdowntheme ddtheme = Dropdowntheme();
List<FocusNode> focusNodes = List.generate(12, (index) => FocusNode(),);
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
...@@ -34,6 +35,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -34,6 +35,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
@override @override
void dispose() { void dispose() {
focusNodes.map((e)=>e.dispose());
super.dispose(); super.dispose();
} }
...@@ -252,7 +254,11 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -252,7 +254,11 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
context, context,
provider.amountController, provider.amountController,
"Enter Amount", "Enter Amount",
provider.updateAmount,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly provider.updateAmount,TextInputType.numberWithOptions(),false,
null,
focusNodes[0],
focusNodes[1],
TextInputAction.next
), ),
errorWidget(context, provider.amountError), errorWidget(context, provider.amountError),
///payment date toBE ///payment date toBE
...@@ -284,6 +290,19 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -284,6 +290,19 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
readOnly: true, readOnly: true,
onChanged: (value) { onChanged: (value) {
},
focusNode: focusNodes[1],
onTapUpOutside: (event) {
if(focusNodes[1].hasFocus){
focusNodes[1].unfocus();
}
},
textInputAction: TextInputAction.done,
onEditingComplete: () {
focusNodes[1].unfocus();
}, },
decoration: InputDecoration( decoration: InputDecoration(
hintText: "Enter Date", hintText: "Enter Date",
...@@ -375,35 +394,50 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -375,35 +394,50 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
context, context,
provider.bankNameController, provider.bankNameController,
"Enter Bank Name", "Enter Bank Name",
provider.updateBankName,TextInputType.text,false,null provider.updateBankName,TextInputType.text,false,null,
focusNodes[2],
focusNodes[3],
TextInputAction.next
), ),
errorWidget(context, provider.bankNameError), errorWidget(context, provider.bankNameError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankBranchController, provider.bankBranchController,
"Enter Bank Branch", "Enter Bank Branch",
provider.updateBankBranch,TextInputType.text,false,null provider.updateBankBranch,TextInputType.text,false,null,
focusNodes[3],
focusNodes[4],
TextInputAction.next
), ),
errorWidget(context, provider.bankBranchError), errorWidget(context, provider.bankBranchError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAccNumberController, provider.bankAccNumberController,
"Enter Account Number", "Enter Account Number",
provider.updateNumber,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly provider.updateNumber,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly,
focusNodes[4],
focusNodes[5],
TextInputAction.next
), ),
errorWidget(context, provider.bankNumberError), errorWidget(context, provider.bankNumberError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankIfscController, provider.bankIfscController,
"Enter Bank IFSC", "Enter Bank IFSC",
provider.updateIFSC,TextInputType.text,false,null provider.updateIFSC,TextInputType.text,false,null,
focusNodes[5],
focusNodes[6],
TextInputAction.next
), ),
errorWidget(context, provider.bankIFSCError), errorWidget(context, provider.bankIFSCError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAcHolderController, provider.bankAcHolderController,
"Enter Bank Account Holder Name", "Enter Bank Account Holder Name",
provider.updateHolder,TextInputType.text,false,null provider.updateHolder,TextInputType.text,false,null,
focusNodes[6],
focusNodes[8],
TextInputAction.next
), ),
errorWidget(context, provider.bankHolderError), errorWidget(context, provider.bankHolderError),
] else if (provider.paymentModeValue == "UPI") ... ] else if (provider.paymentModeValue == "UPI") ...
...@@ -412,7 +446,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -412,7 +446,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
context, context,
provider.bankUpiController, provider.bankUpiController,
"Enter UPI ID", "Enter UPI ID",
provider.updateUPI,TextInputType.text,false,null provider.updateUPI,TextInputType.text,false,null,
focusNodes[7],
focusNodes[8],
TextInputAction.next
), ),
errorWidget(context, provider.UPIError), errorWidget(context, provider.UPIError),
], ],
...@@ -420,14 +457,20 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -420,14 +457,20 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
context, context,
provider.paymentReferenceController, provider.paymentReferenceController,
"Enter Payment Reference Number", "Enter Payment Reference Number",
provider.updatereference,TextInputType.text,false,null provider.updatereference,TextInputType.text,false,null,
focusNodes[8],
focusNodes[9],
TextInputAction.next
), ),
errorWidget(context, provider.paymentreferenceError), errorWidget(context, provider.paymentreferenceError),
textControllerWidget( textControllerWidget(
context, context,
provider.descController, provider.descController,
"Enter Description", "Enter Description",
provider.updateDescription,TextInputType.text,false,null provider.updateDescription,TextInputType.text,false,null,
focusNodes[9],
focusNodes[10],
TextInputAction.done
), ),
errorWidget(context, provider.descriptionError), errorWidget(context, provider.descriptionError),
InkResponse( InkResponse(
...@@ -502,7 +545,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -502,7 +545,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
), ),
child: provider.submitClicked?CircularProgressIndicator.adaptive( child: provider.submitClicked?CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation(AppColors.app_blue), valueColor: AlwaysStoppedAnimation(AppColors.white),
): Text( ): Text(
"Submit", "Submit",
style: TextStyle( style: TextStyle(
......
lib/screens/finance/directPaymentRequesitionList.dart
View file @ b7f79d62
...@@ -25,6 +25,8 @@ class Directpaymentrequesitionlist extends StatefulWidget { ...@@ -25,6 +25,8 @@ class Directpaymentrequesitionlist extends StatefulWidget {
class _DirectpaymentrequesitionlistState class _DirectpaymentrequesitionlistState
extends State<Directpaymentrequesitionlist> { extends State<Directpaymentrequesitionlist> {
Dropdowntheme ddtheme = Dropdowntheme(); Dropdowntheme ddtheme = Dropdowntheme();
List<FocusNode> focusNodes = List.generate(12, (index) => FocusNode(),);
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
...@@ -40,6 +42,7 @@ class _DirectpaymentrequesitionlistState ...@@ -40,6 +42,7 @@ class _DirectpaymentrequesitionlistState
@override @override
void dispose() { void dispose() {
focusNodes.map((e) => e.dispose(),);
super.dispose(); super.dispose();
} }
...@@ -263,7 +266,11 @@ class _DirectpaymentrequesitionlistState ...@@ -263,7 +266,11 @@ class _DirectpaymentrequesitionlistState
context, context,
provider.amountController, provider.amountController,
"Enter Amount", "Enter Amount",
provider.updateAmount,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly provider.updateAmount,TextInputType.numberWithOptions(),
false,null,
focusNodes[0],
focusNodes[1],
TextInputAction.next
), ),
errorWidget(context, provider.amountError), errorWidget(context, provider.amountError),
...@@ -298,6 +305,19 @@ class _DirectpaymentrequesitionlistState ...@@ -298,6 +305,19 @@ class _DirectpaymentrequesitionlistState
maxLines: 1, maxLines: 1,
readOnly: true, readOnly: true,
onChanged: (value) {}, onChanged: (value) {},
focusNode: focusNodes[1],
onTapUpOutside: (event) {
if(focusNodes[1].hasFocus){
focusNodes[1].unfocus();
}
},
textInputAction: TextInputAction.done,
onEditingComplete: () {
focusNodes[1].unfocus();
},
decoration: InputDecoration( decoration: InputDecoration(
hintText: "Enter Date", hintText: "Enter Date",
hintStyle: TextStyle( hintStyle: TextStyle(
...@@ -386,35 +406,50 @@ class _DirectpaymentrequesitionlistState ...@@ -386,35 +406,50 @@ class _DirectpaymentrequesitionlistState
context, context,
provider.bankNameController, provider.bankNameController,
"Enter Bank Name", "Enter Bank Name",
provider.updateBankName,TextInputType.text,false,null provider.updateBankName,TextInputType.text,false,null,
focusNodes[2],
focusNodes[3],
TextInputAction.next
), ),
errorWidget(context, provider.bankNameError), errorWidget(context, provider.bankNameError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankBranchController, provider.bankBranchController,
"Enter Bank Branch", "Enter Bank Branch",
provider.updateBankBranch,TextInputType.text,false,null provider.updateBankBranch,TextInputType.text,false,null,
focusNodes[3],
focusNodes[4],
TextInputAction.next
), ),
errorWidget(context, provider.bankBranchError), errorWidget(context, provider.bankBranchError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAccNumberController, provider.bankAccNumberController,
"Enter Account Number", "Enter Account Number",
provider.updateNumber,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly provider.updateNumber,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly,
focusNodes[4],
focusNodes[5],
TextInputAction.next
), ),
errorWidget(context, provider.bankNumberError), errorWidget(context, provider.bankNumberError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankIfscController, provider.bankIfscController,
"Enter Bank IFSC", "Enter Bank IFSC",
provider.updateIFSC,TextInputType.text,false,null provider.updateIFSC,TextInputType.text,false,null,
focusNodes[5],
focusNodes[6],
TextInputAction.next
), ),
errorWidget(context, provider.bankIFSCError), errorWidget(context, provider.bankIFSCError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAcHolderController, provider.bankAcHolderController,
"Enter Bank Account Holder Name", "Enter Bank Account Holder Name",
provider.updateHolder,TextInputType.text,false,null provider.updateHolder,TextInputType.text,false,null,
focusNodes[6],
focusNodes[8],
TextInputAction.next
), ),
errorWidget(context, provider.bankHolderError), errorWidget(context, provider.bankHolderError),
] else if (provider.directPaymentModesValues == "UPI") ...[ ] else if (provider.directPaymentModesValues == "UPI") ...[
...@@ -422,7 +457,10 @@ class _DirectpaymentrequesitionlistState ...@@ -422,7 +457,10 @@ class _DirectpaymentrequesitionlistState
context, context,
provider.bankUpiController, provider.bankUpiController,
"Enter UPI ID", "Enter UPI ID",
provider.updateUPI,TextInputType.text,false,null provider.updateUPI,TextInputType.text,false,null,
focusNodes[7],
focusNodes[8],
TextInputAction.next
), ),
errorWidget(context, provider.UPIError), errorWidget(context, provider.UPIError),
], ],
...@@ -430,14 +468,20 @@ class _DirectpaymentrequesitionlistState ...@@ -430,14 +468,20 @@ class _DirectpaymentrequesitionlistState
context, context,
provider.paymentReferenceController, provider.paymentReferenceController,
"Enter Payment Reference Number", "Enter Payment Reference Number",
provider.updateReference,TextInputType.text,false,null provider.updateReference,TextInputType.text,false,null,
focusNodes[8],
focusNodes[9],
TextInputAction.next
), ),
errorWidget(context, provider.paymentreferenceerror), errorWidget(context, provider.paymentreferenceerror),
textControllerWidget( textControllerWidget(
context, context,
provider.descController, provider.descController,
"Enter Description", "Enter Description",
provider.updateDescription,TextInputType.text,false,null provider.updateDescription,TextInputType.text,false,null,
focusNodes[9],
focusNodes[10],
TextInputAction.done
), ),
errorWidget(context, provider.descriptionError), errorWidget(context, provider.descriptionError),
InkResponse( InkResponse(
......
lib/screens/finance/submitPaymentRequestionListsByMode.dart
View file @ b7f79d62
...@@ -24,6 +24,7 @@ class Submitpaymentrequestionlistsbymode extends StatefulWidget { ...@@ -24,6 +24,7 @@ class Submitpaymentrequestionlistsbymode extends StatefulWidget {
class _SubmitpaymentrequestionlistsbymodeState class _SubmitpaymentrequestionlistsbymodeState
extends State<Submitpaymentrequestionlistsbymode> { extends State<Submitpaymentrequestionlistsbymode> {
Dropdowntheme ddtheme = Dropdowntheme(); Dropdowntheme ddtheme = Dropdowntheme();
List<FocusNode> focusNodes = List.generate(11, (index) => FocusNode(),);
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
...@@ -36,6 +37,7 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -36,6 +37,7 @@ class _SubmitpaymentrequestionlistsbymodeState
@override @override
void dispose() { void dispose() {
focusNodes.map((e)=>e.dispose());
super.dispose(); super.dispose();
} }
...@@ -115,6 +117,7 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -115,6 +117,7 @@ class _SubmitpaymentrequestionlistsbymodeState
"hfjkshfg" + "hfjkshfg" +
provider.accountId.toString(), provider.accountId.toString(),
); );
provider.paymentRequestionBankDetailsAPIFunction(context, provider.accountId);
} }
} }
}, },
...@@ -218,7 +221,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -218,7 +221,10 @@ class _SubmitpaymentrequestionlistsbymodeState
context, context,
provider.reqPurposeController, provider.reqPurposeController,
"Enter Request Purpose", "Enter Request Purpose",
provider.updateReqPupose,TextInputType.text,false,null provider.updateReqPupose,TextInputType.text,false,null,
focusNodes[0],
focusNodes[1],
TextInputAction.next
), ),
], ],
errorWidget(context, provider.reqPurposeError), errorWidget(context, provider.reqPurposeError),
...@@ -227,7 +233,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -227,7 +233,10 @@ class _SubmitpaymentrequestionlistsbymodeState
context, context,
provider.descController, provider.descController,
"Enter Description", "Enter Description",
provider.updateDescription,TextInputType.text,false,null provider.updateDescription,TextInputType.text,false,null,
focusNodes[1],
focusNodes[2],
TextInputAction.next
), ),
errorWidget(context, provider.descriptionError), errorWidget(context, provider.descriptionError),
...@@ -235,7 +244,11 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -235,7 +244,11 @@ class _SubmitpaymentrequestionlistsbymodeState
context, context,
provider.amountController, provider.amountController,
"Enter Amount", "Enter Amount",
provider.updateAmount,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly provider.updateAmount,TextInputType.numberWithOptions(),false,
null,
focusNodes[2],
null,
TextInputAction.done
), ),
errorWidget(context, provider.amountError), errorWidget(context, provider.amountError),
...@@ -356,7 +369,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -356,7 +369,10 @@ class _SubmitpaymentrequestionlistsbymodeState
context, context,
provider.bankNameController, provider.bankNameController,
"Enter Bank Name", "Enter Bank Name",
provider.updateBankName,TextInputType.text,false,null provider.updateBankName,TextInputType.text,false,null,
focusNodes[3],
focusNodes[4],
TextInputAction.next
), ),
errorWidget(context, provider.bankNameError), errorWidget(context, provider.bankNameError),
...@@ -364,7 +380,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -364,7 +380,10 @@ class _SubmitpaymentrequestionlistsbymodeState
context, context,
provider.bankBranchController, provider.bankBranchController,
"Enter Bank Branch", "Enter Bank Branch",
provider.updateBankBranch,TextInputType.text,false,null provider.updateBankBranch,TextInputType.text,false,null,
focusNodes[4],
focusNodes[5],
TextInputAction.next
), ),
errorWidget(context, provider.bankBranchError), errorWidget(context, provider.bankBranchError),
...@@ -372,7 +391,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -372,7 +391,10 @@ class _SubmitpaymentrequestionlistsbymodeState
context, context,
provider.bankAccNumberController, provider.bankAccNumberController,
"Enter Account Number", "Enter Account Number",
provider.updateNumber,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly provider.updateNumber,TextInputType.number,false,FilteringTextInputFormatter.digitsOnly,
focusNodes[5],
focusNodes[6],
TextInputAction.next
), ),
errorWidget(context, provider.bankNumberError), errorWidget(context, provider.bankNumberError),
...@@ -380,7 +402,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -380,7 +402,10 @@ class _SubmitpaymentrequestionlistsbymodeState
context, context,
provider.bankIfscController, provider.bankIfscController,
"Enter Bank IFSC", "Enter Bank IFSC",
provider.updateIFSC,TextInputType.text,false,null provider.updateIFSC,TextInputType.text,false,null,
focusNodes[6],
focusNodes[7],
TextInputAction.next
), ),
errorWidget(context, provider.bankIFSCError), errorWidget(context, provider.bankIFSCError),
...@@ -388,7 +413,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -388,7 +413,10 @@ class _SubmitpaymentrequestionlistsbymodeState
context, context,
provider.bankAcHolderController, provider.bankAcHolderController,
"Enter Bank Account Holder Name", "Enter Bank Account Holder Name",
provider.updateHolder,TextInputType.text,false,null provider.updateHolder,TextInputType.text,false,null,
focusNodes[7],
null,
TextInputAction.done
), ),
errorWidget(context, provider.bankHolderError), errorWidget(context, provider.bankHolderError),
] else if (provider.paymentModeValue == "UPI") ...[ ] else if (provider.paymentModeValue == "UPI") ...[
...@@ -396,7 +424,10 @@ class _SubmitpaymentrequestionlistsbymodeState ...@@ -396,7 +424,10 @@ class _SubmitpaymentrequestionlistsbymodeState
context, context,
provider.bankUpiController, provider.bankUpiController,
"Enter UPI ID", "Enter UPI ID",
provider.updateUPI,TextInputType.text,false,null provider.updateUPI,TextInputType.text,false,null,
focusNodes[8],
null,
TextInputAction.done
), ),
errorWidget(context, provider.UPIError), errorWidget(context, provider.UPIError),
], ],
......
lib/services/api_calling.dart
View file @ b7f79d62
...@@ -59,6 +59,7 @@ import '../Models/UpdateComplaintResponse.dart'; ...@@ -59,6 +59,7 @@ import '../Models/UpdateComplaintResponse.dart';
import '../Models/UpdatePasswordResponse.dart'; import '../Models/UpdatePasswordResponse.dart';
import '../Models/VersionsResponse.dart'; import '../Models/VersionsResponse.dart';
import '../Models/ViewVisitDetailsResponse.dart'; import '../Models/ViewVisitDetailsResponse.dart';
import '../Models/financeModels/paymentRequestionBankDetailsResponse.dart';
import '../Models/commonModels/commonAccountLedgerFilterResponse.dart'; import '../Models/commonModels/commonAccountLedgerFilterResponse.dart';
import '../Models/commonModels/commonAccountLedgerResponse.dart'; import '../Models/commonModels/commonAccountLedgerResponse.dart';
import '../Models/commonModels/commonAccountdetailsResponse.dart'; import '../Models/commonModels/commonAccountdetailsResponse.dart';
...@@ -1561,6 +1562,32 @@ class ApiCalling { ...@@ -1561,6 +1562,32 @@ class ApiCalling {
} }
} }
static Future<paymentRequestionBankDetailsResponse?> paymentRequestionBankDetailsAPI(
empId,
session,
account_id,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'account_id': (account_id).toString(),
};
final res = await post(data, paymentRequestBankDetailsUrl, {});
if (res != null) {
print("Bank Detaols ${data}");
debugPrint(res.body);
return paymentRequestionBankDetailsResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<approveRejectPaymentRequestResponse?> static Future<approveRejectPaymentRequestResponse?>
approveRejectPaymentRequestAPI(empId, session, payment_request_id) async { approveRejectPaymentRequestAPI(empId, session, payment_request_id) async {
try { try {
...@@ -1859,6 +1886,8 @@ class ApiCalling { ...@@ -1859,6 +1886,8 @@ class ApiCalling {
} }
} }
static Future<DistrictsResponse?> commonAddAccountViewDistrictAPI( static Future<DistrictsResponse?> commonAddAccountViewDistrictAPI(
empId, empId,
session, session,
......
lib/services/api_names.dart
View file @ b7f79d62
...@@ -63,6 +63,7 @@ const addDirectPaymentRequestionSubmitUrl = "${baseUrl_test}add_direct_payment_s ...@@ -63,6 +63,7 @@ const addDirectPaymentRequestionSubmitUrl = "${baseUrl_test}add_direct_payment_s
const addPaymentReceiptSubmitUrl = "${baseUrl_test}add_payment_receipt_submit"; const addPaymentReceiptSubmitUrl = "${baseUrl_test}add_payment_receipt_submit";
const paymentRequestionListUrl = "${baseUrl_test}payment_requsition_list"; const paymentRequestionListUrl = "${baseUrl_test}payment_requsition_list";
const paymentRequestionDetailsUrl = "${baseUrl_test}payment_requisition_details"; const paymentRequestionDetailsUrl = "${baseUrl_test}payment_requisition_details";
const paymentRequestBankDetailsUrl = "${baseUrl_test}get_account_bank_details";
const approveRejectPaymentRequestUrl = "${baseUrl_test}approve_reject_payment_request_view"; const approveRejectPaymentRequestUrl = "${baseUrl_test}approve_reject_payment_request_view";
const approveRejectPaymentRequestSubmitUrl = "${baseUrl_test}approve_reject_payment_request_submit"; const approveRejectPaymentRequestSubmitUrl = "${baseUrl_test}approve_reject_payment_request_submit";
const paymentRequesitionPaymentsListUrl = "${baseUrl_test}payment_requistion_payments_list"; const paymentRequesitionPaymentsListUrl = "${baseUrl_test}payment_requistion_payments_list";
......
pubspec.yaml
View file @ b7f79d62
...@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev ...@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.88+92 version: 1.0.89+93
environment: environment:
sdk: ^3.7.2 sdk: ^3.7.2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment