Skip to content

GitLab

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

20-05-2025 By Sai Srinivas 

Common Module,finance Module test errors
parent eadb9dd9
Hide whitespace changes
Inline Side-by-side
lib/Notifiers/commonProvider/accountsListProvider.dart
View file @ bf7b934c
...@@ -11,7 +11,6 @@ import '../../Models/commonModels/commonAccountlistResponse.dart'; ...@@ -11,7 +11,6 @@ import '../../Models/commonModels/commonAccountlistResponse.dart';
import '../../Models/commonModels/commonAddAccountsViewResponse.dart'; import '../../Models/commonModels/commonAddAccountsViewResponse.dart';
class Accountslistprovider extends ChangeNotifier { class Accountslistprovider extends ChangeNotifier {
TextEditingController nameController = TextEditingController(); TextEditingController nameController = TextEditingController();
TextEditingController mobileController = TextEditingController(); TextEditingController mobileController = TextEditingController();
TextEditingController addressController = TextEditingController(); TextEditingController addressController = TextEditingController();
...@@ -19,17 +18,35 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -19,17 +18,35 @@ class Accountslistprovider extends ChangeNotifier {
TextEditingController branchNameController = TextEditingController(); TextEditingController branchNameController = TextEditingController();
TextEditingController bankIfscCotroller = TextEditingController(); TextEditingController bankIfscCotroller = TextEditingController();
TextEditingController bankHolderNameController = TextEditingController(); TextEditingController bankHolderNameController = TextEditingController();
TextEditingController bankAcNameController = TextEditingController(); TextEditingController bankAcNumberController = TextEditingController();
TextEditingController bankUpiController = TextEditingController(); TextEditingController bankUpiController = TextEditingController();
TextEditingController contactPersonController = TextEditingController(); TextEditingController contactPersonController = TextEditingController();
TextEditingController contectPersonDesignationController = TextEditingController(); TextEditingController contectPersonDesignationController = TextEditingController();
TextEditingController contectPersonAltMobController = TextEditingController(); TextEditingController contectPersonAltMobController = TextEditingController();
TextEditingController contectPersonTeleController = TextEditingController(); TextEditingController contectPersonTeleController = TextEditingController();
TextEditingController contectPersonMailController = TextEditingController(); TextEditingController contectPersonMailController = TextEditingController();
TextEditingController mobileNumberController = TextEditingController(); TextEditingController mobileNumberController = TextEditingController();
TextEditingController companyNameController = TextEditingController(); TextEditingController companyNameController = TextEditingController();
String? accountError;
String? nameError;
String? mobileError;
String? stateError;
String? districtError;
String? localityError;
String? addressError;
String? banknameError;
String? bankBranchError;
String? bankIFSCError;
String? bankHolderNameError;
String? bankAcNumberError;
String? upiError;
String? contactPersonError;
String? desigantionError;
String? altMobError;
String? teleError;
String? mailError;
List<States> _states = []; List<States> _states = [];
List<Districts> _districts = []; List<Districts> _districts = [];
List<SubLocations> _subLocations = []; List<SubLocations> _subLocations = [];
...@@ -41,8 +58,10 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -41,8 +58,10 @@ class Accountslistprovider extends ChangeNotifier {
bool get isLoading => _isLoading; bool get isLoading => _isLoading;
int _pageNum = 1; int _pageNum = 1;
int get pageNum => _pageNum; int get pageNum => _pageNum;
set pageNum (value){
set pageNum(value) {
_pageNum = value; _pageNum = value;
notifyListeners(); notifyListeners();
} }
...@@ -56,12 +75,16 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -56,12 +75,16 @@ class Accountslistprovider extends ChangeNotifier {
List<SubLocations> get subLocations => _subLocations; List<SubLocations> get subLocations => _subLocations;
List<String> get accountTypes => _accountTypes; List<String> get accountTypes => _accountTypes;
List<AccountList> get accountsList => _accountsList; List<AccountList> get accountsList => _accountsList;
bool get isVisible => _isVisible; bool get isVisible => _isVisible;
set isVisible (bool value){
set isVisible(bool value) {
_isVisible = value; _isVisible = value;
notifyListeners(); notifyListeners();
} }
States? _selectedState; States? _selectedState;
Districts? _selectedDistricts; Districts? _selectedDistricts;
SubLocations? _selectedSubLocations; SubLocations? _selectedSubLocations;
...@@ -98,6 +121,7 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -98,6 +121,7 @@ class Accountslistprovider extends ChangeNotifier {
set selectedAccountType(String? value) { set selectedAccountType(String? value) {
_selectedAccountType = value; _selectedAccountType = value;
accountError = null;
notifyListeners(); notifyListeners();
} }
...@@ -105,6 +129,7 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -105,6 +129,7 @@ class Accountslistprovider extends ChangeNotifier {
_selectedState = value; _selectedState = value;
_selectedStateID = value!.id; _selectedStateID = value!.id;
_selectedStateValue = value!.name; _selectedStateValue = value!.name;
stateError = null;
notifyListeners(); notifyListeners();
} }
...@@ -112,6 +137,7 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -112,6 +137,7 @@ class Accountslistprovider extends ChangeNotifier {
_selectedDistricts = value; _selectedDistricts = value;
_selectedDistrictID = value!.id; _selectedDistrictID = value!.id;
_selectedDistrictValue = value!.district; _selectedDistrictValue = value!.district;
districtError = null;
notifyListeners(); notifyListeners();
} }
...@@ -119,32 +145,36 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -119,32 +145,36 @@ class Accountslistprovider extends ChangeNotifier {
_selectedSubLocations = value; _selectedSubLocations = value;
_selectedSubLocID = value!.id; _selectedSubLocID = value!.id;
_selectedSubLocValue = value!.subLocality!; _selectedSubLocValue = value!.subLocality!;
localityError = null;
notifyListeners(); notifyListeners();
} }
set selectedStateID(value){ set selectedStateID(value) {
_selectedStateID = value; _selectedStateID = value;
notifyListeners(); notifyListeners();
} }
set selectedStateValue(value){
set selectedStateValue(value) {
_selectedStateID = value; _selectedStateID = value;
notifyListeners(); notifyListeners();
} }
set selectedDistrictId(value){
set selectedDistrictId(value) {
_selectedDistrictID = value; _selectedDistrictID = value;
notifyListeners(); notifyListeners();
} }
set selectedDistrictValue(value){
set selectedDistrictValue(value) {
_selectedDistrictValue = value; _selectedDistrictValue = value;
notifyListeners(); notifyListeners();
} }
set selectedSubLocID(value){ set selectedSubLocID(value) {
_selectedSubLocID = value; _selectedSubLocID = value;
notifyListeners(); notifyListeners();
} }
set selectedSubLocValue(value){ set selectedSubLocValue(value) {
_selectedSubLocValue = value; _selectedSubLocValue = value;
notifyListeners(); notifyListeners();
} }
...@@ -218,7 +248,6 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -218,7 +248,6 @@ class Accountslistprovider extends ChangeNotifier {
); );
if (data != null) { if (data != null) {
if (data.error == "0") { if (data.error == "0") {
} else if (data.error == "1") { } else if (data.error == "1") {
toast(context, data.message); toast(context, data.message);
} }
...@@ -226,10 +255,12 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -226,10 +255,12 @@ class Accountslistprovider extends ChangeNotifier {
} catch (e, s) {} } catch (e, s) {}
} }
Future<void> submitCommonAccountsAPI( Future<void> submitCommonAccountsAPI(context) async {
context,
) async {
try { try {
if (!validatereceiptForm(context)) {
// _submitClicked = false;
return;
}
var homeProv = Provider.of<HomescreenNotifier>(context, listen: false); var homeProv = Provider.of<HomescreenNotifier>(context, listen: false);
final data = await ApiCalling.commonAddAccountSubmitAPI( final data = await ApiCalling.commonAddAccountSubmitAPI(
homeProv.empId, homeProv.empId,
...@@ -249,7 +280,7 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -249,7 +280,7 @@ class Accountslistprovider extends ChangeNotifier {
branchNameController.text, branchNameController.text,
bankIfscCotroller.text, bankIfscCotroller.text,
bankHolderNameController.text, bankHolderNameController.text,
bankAcNameController.text, bankAcNumberController.text,
bankUpiController.text, bankUpiController.text,
); );
if (data != null) { if (data != null) {
...@@ -258,54 +289,209 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -258,54 +289,209 @@ class Accountslistprovider extends ChangeNotifier {
resetValues(); resetValues();
toast(context, data.message); toast(context, data.message);
} else if (data.error == "1") { } else if (data.error == "1") {
toast(context, data.message); toast(context, data.message);
} else {} } else {}
} }
} catch (e, s) {} } catch (e, s) {}
} }
bool validatereceiptForm(BuildContext context) {
accountError = null;
nameError = null;
mobileError = null;
stateError = null;
districtError = null;
localityError = null;
addressError = null;
banknameError = null;
bankBranchError = null;
bankIFSCError = null;
bankHolderNameError = null;
bankAcNumberError = null;
upiError = null;
contactPersonError = null;
desigantionError = null;
altMobError = null;
teleError = null;
mailError = null;
bool isValid = true;
if (_selectedAccountType == null || _selectedAccountType!.isEmpty) {
accountError = "Please select an Account";
isValid = false;
}
if (nameController.text.trim().isEmpty) {
nameError = "Please Enter a Name";
isValid = false;
}
if (mobileController.text.trim().isEmpty) {
mobileError = "Please Enter Mobile Number";
isValid = false;
}
if (_selectedState == null || _selectedStateID!.isEmpty) {
stateError = "Please select a State";
isValid = false;
}
if (_selectedDistricts == null || _selectedDistrictID!.isEmpty) {
districtError = "Please select a District";
isValid = false;
}
if (_selectedSubLocations == null || _selectedSubLocID!.isEmpty) {
localityError = "Please select a Locality";
isValid = false;
}
if (addressController.text.trim().isEmpty) {
addressError = "Please Enter an Address";
isValid = false;
}
if (bankNameController.text.trim().isEmpty) {
banknameError = "Please Enter a Bank Name";
isValid = false;
}
if (branchNameController.text.trim().isEmpty) {
bankBranchError = "Please Enter Branch Name";
isValid = false;
}
if (bankIfscCotroller.text.trim().isEmpty) {
bankIFSCError = "Please Enter Bank IFSC";isValid = false;
}
if (bankHolderNameController.text.trim().isEmpty) {
bankHolderNameError = "Please Enter Account Holder Name";isValid = false;
}
if (bankAcNumberController.text.trim().isEmpty) {
bankAcNumberError= "Please Enter Bank Account Number"; isValid = false;
}
if (bankUpiController.text.trim().isEmpty) {
upiError= "Please Enter UPI ID"; isValid = false;
}
if (contactPersonController.text.trim().isEmpty) {
contactPersonError= "Please Enter Contact Person Name"; isValid = false;
}
if (contectPersonDesignationController.text.trim().isEmpty) {
desigantionError= "Please Enter Designation"; isValid = false;
}
if (contectPersonAltMobController.text.trim().isEmpty) {
altMobError= "Please Enter Mobile Number"; isValid = false;
}
// if (contectPersonTeleController.text.trim().isEmpty) {
// teleError= "Please Enter Telephone"; isValid = false;
// }
// if (contectPersonMailController.text.trim().isEmpty) {
// teleError= "Please Enter"; isValid = false;
// }
notifyListeners();
return isValid;
}
void updateName(String value) {
nameError = null;
notifyListeners();
}
void updateMobile(String value) {
mobileError = null;
notifyListeners();
}
void updateAddress(String value) {
addressError = null;
notifyListeners();
}
void updateBankName(String value) {
banknameError = null;
notifyListeners();
}
void updateBankBranch(String value) {
bankBranchError = null;
notifyListeners();
}
void updateIFSC(String value) {
bankIFSCError = null;
notifyListeners();
}
void updateHolder(String value) {
bankHolderNameError = null;
notifyListeners();
}
void updateNumber(String value) {
bankAcNumberError = null;
notifyListeners();
}
void updateUPI(String value) {
upiError = null;
notifyListeners();
}
void updateContactPerson(String value){
contactPersonError = null;
notifyListeners();
}
void updateDesignation(String value){
desigantionError = null;
notifyListeners();
}
void updateAltMobile(String value){
altMobError = null;
notifyListeners();
}
void updateTeleMobile(String value){
teleError = null;
notifyListeners();
}
void updateMail(String value){
mailError = null;
notifyListeners();
}
Future<void> commonAccountListAPIFunction(context) async { Future<void> commonAccountListAPIFunction(context) async {
try{ try {
var prov = Provider.of<HomescreenNotifier>(context,listen: false); var prov = Provider.of<HomescreenNotifier>(context, listen: false);
if(_pageNum==1){ if (_pageNum == 1) {
_accountsList.clear(); _accountsList.clear();
notifyListeners(); notifyListeners();
} }
final data = await ApiCalling.commonAccountListAPI(prov.empId, prov.session,_pageNum,companyNameController.text,mobileNumberController.text); final data = await ApiCalling.commonAccountListAPI(
if(data!=null){ prov.empId,
prov.session,
_pageNum,
companyNameController.text,
mobileNumberController.text,
);
if (data != null) {
print("pageNum $_pageNum"); print("pageNum $_pageNum");
if(data.error=="0"){ if (data.error == "0") {
_hasMoreData = true; _hasMoreData = true;
_accountsList.addAll(data.accountList!); _accountsList.addAll(data.accountList!);
_pageNum++;
_isLoading = false;
_pageNum++;
_isLoading = false;
notifyListeners(); notifyListeners();
}else{ } else {
_hasMoreData = false; _hasMoreData = false;
_isLoading = false; _isLoading = false;
notifyListeners(); notifyListeners();
} }
} }
} catch (e, s) {}
}catch (e,s){
}
} }
resetValues(){ resetValues() {
_selectedAccountType = null; _selectedAccountType = null;
_selectedStateID=null; _selectedStateID = null;
_selectedDistrictID=null; _selectedDistrictID = null;
_selectedSubLocID=null; _selectedSubLocID = null;
nameController.clear(); nameController.clear();
mobileController.clear(); mobileController.clear();
...@@ -318,7 +504,7 @@ class Accountslistprovider extends ChangeNotifier { ...@@ -318,7 +504,7 @@ class Accountslistprovider extends ChangeNotifier {
branchNameController.clear(); branchNameController.clear();
bankIfscCotroller.clear(); bankIfscCotroller.clear();
bankHolderNameController.clear(); bankHolderNameController.clear();
bankAcNameController.clear(); bankAcNumberController.clear();
bankUpiController.clear(); bankUpiController.clear();
} }
} }
lib/Notifiers/financeProvider/RequestionListProvider.dart
View file @ bf7b934c
...@@ -11,6 +11,7 @@ import 'package:generp/Notifiers/HomeScreenNotifier.dart'; ...@@ -11,6 +11,7 @@ import 'package:generp/Notifiers/HomeScreenNotifier.dart';
import 'package:generp/Notifiers/HomeScreenNotifier.dart'; import 'package:generp/Notifiers/HomeScreenNotifier.dart';
import 'package:generp/Utils/commonServices.dart'; import 'package:generp/Utils/commonServices.dart';
import 'package:generp/services/api_calling.dart'; import 'package:generp/services/api_calling.dart';
import 'package:get/get.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
...@@ -37,6 +38,7 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -37,6 +38,7 @@ class Requestionlistprovider extends ChangeNotifier {
TextEditingController bankAcHolderController = TextEditingController(); TextEditingController bankAcHolderController = TextEditingController();
TextEditingController bankUpiController = TextEditingController(); TextEditingController bankUpiController = TextEditingController();
TextEditingController paymentReferenceController = TextEditingController(); TextEditingController paymentReferenceController = TextEditingController();
TextEditingController dateController = TextEditingController();
// Date picker state // Date picker state
DateTime? _date; DateTime? _date;
String? _formattedDate; String? _formattedDate;
...@@ -90,15 +92,25 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -90,15 +92,25 @@ class Requestionlistprovider extends ChangeNotifier {
String get directPaymentModesValues => _directPaymentModesValues; String get directPaymentModesValues => _directPaymentModesValues;
// Date picker methods // Date picker methods
String? get formattedDate => _formattedDate;
set formattedDate(String? value){
_formattedDate = value;
dateController.text = _formattedDate!;
dateError = null;
notifyListeners();
}
void setDate(DateTime newDate) { void setDate(DateTime newDate) {
_date = newDate; _date = newDate;
_formattedDate = DateFormat('yyyy-MM-dd').format(newDate); _formattedDate = DateFormat('yyyy-MM-dd').format(newDate);
dateController.text = _formattedDate!;
dateError = null;
notifyListeners(); notifyListeners();
} }
set selectDirectAccounts(DirectAccounts? value) { set selectDirectAccounts(DirectAccounts? value) {
_selectedDirectAccounts = value; _selectedDirectAccounts = value;
_directAccountID = value!.id!; _directAccountID = value!.id!;
_directAccountValue = value!.name!; _directAccountValue = value!.name!;
selectDirectAccountError = null;
notifyListeners(); notifyListeners();
} }
...@@ -106,6 +118,7 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -106,6 +118,7 @@ class Requestionlistprovider extends ChangeNotifier {
_selectDirectPaymentAccounts = value; _selectDirectPaymentAccounts = value;
_directPaymentAccountsID = value!.id!; _directPaymentAccountsID = value!.id!;
_directPaymentAccountsValue = value!.name!; _directPaymentAccountsValue = value!.name!;
selectDirectPaymentAccountError = null;
notifyListeners(); notifyListeners();
} }
...@@ -113,6 +126,7 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -113,6 +126,7 @@ class Requestionlistprovider extends ChangeNotifier {
_selectDirectPaymentModes = value; _selectDirectPaymentModes = value;
_directPaymentModesID = value!.id!; _directPaymentModesID = value!.id!;
_directPaymentModesValues = value!.name!; _directPaymentModesValues = value!.name!;
selectDirectPaymentError = null;
notifyListeners(); notifyListeners();
} }
...@@ -156,6 +170,11 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -156,6 +170,11 @@ class Requestionlistprovider extends ChangeNotifier {
String _reqPurpose = ""; String _reqPurpose = "";
String? selectAccountError; String? selectAccountError;
String? selectDirectAccountError;
String? dateError;
String? selectDirectPaymentAccountError;
String? selectDirectPaymentError;
String? paymentreferenceerror;
String? reqPurposeError; String? reqPurposeError;
String? descriptionError; String? descriptionError;
String? amountError; String? amountError;
...@@ -204,7 +223,7 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -204,7 +223,7 @@ class Requestionlistprovider extends ChangeNotifier {
List<String> get requestingPurposes => _requestingPurposes; List<String> get requestingPurposes => _requestingPurposes;
List<RequistionList> get requisitionList => _requisitionList; List<RequistionList> get requisitionList => _requisitionList;
String? get formattedDate => _formattedDate;
// bool get submitClicked => _submitClicked; // bool get submitClicked => _submitClicked;
// set submitClicked(bool value){ // set submitClicked(bool value){
...@@ -360,8 +379,8 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -360,8 +379,8 @@ class Requestionlistprovider extends ChangeNotifier {
_image, _image,
); );
if (data != null) { if (data != null) {
if (data['error'] == "0") { if (data.error == "0") {
print(data['error'] == "0"); print(data.error == "0");
toast(context, "Added Successfully"); toast(context, "Added Successfully");
resetForm(); resetForm();
...@@ -417,6 +436,7 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -417,6 +436,7 @@ class Requestionlistprovider extends ChangeNotifier {
try { try {
// _submitClicked = true; // _submitClicked = true;
if (!validateDirectForm(context)) { if (!validateDirectForm(context)) {
print("came here");
// _submitClicked = false; // _submitClicked = false;
return; return;
} }
...@@ -444,14 +464,15 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -444,14 +464,15 @@ class Requestionlistprovider extends ChangeNotifier {
bankUpiController.text, bankUpiController.text,
_image); _image);
if (data != null) { if (data != null) {
if (data['error'] == "0") {
print(data['error'] == "0");
toast(context, "Added Successfully"); if(data.error=="0"){
resetForm(); toast(context, "Added Successfully");
Navigator.pop(context, true); resetForm();
notifyListeners(); Navigator.pop(context, true);
} else {} notifyListeners();
}
} }
} catch (e, s) {} } catch (e, s) {}
} }
...@@ -531,7 +552,6 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -531,7 +552,6 @@ class Requestionlistprovider extends ChangeNotifier {
Expanded( Expanded(
flex: 3, flex: 3,
child: CupertinoDatePicker( child: CupertinoDatePicker(
minimumDate:_date ?? DateTime.now(),
initialDateTime: _date ?? DateTime.now(), initialDateTime: _date ?? DateTime.now(),
mode: CupertinoDatePickerMode.date, mode: CupertinoDatePickerMode.date,
use24hFormat: true, use24hFormat: true,
...@@ -807,7 +827,8 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -807,7 +827,8 @@ class Requestionlistprovider extends ChangeNotifier {
bankAcHolderController.clear(); bankAcHolderController.clear();
bankUpiController.clear(); bankUpiController.clear();
paymentReferenceController.clear(); paymentReferenceController.clear();
dateController.clear();
_formattedDate = "";
_selectedAccounts = null; _selectedAccounts = null;
_selectedPayment = null; _selectedPayment = null;
_selectReqPurpose = null; _selectReqPurpose = null;
...@@ -824,6 +845,10 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -824,6 +845,10 @@ class Requestionlistprovider extends ChangeNotifier {
// Clear validation errors // Clear validation errors
selectAccountError = null; selectAccountError = null;
selectDirectAccountError = null;
selectDirectAccountError = null;
dateError = null;
paymentreferenceerror = null;
reqPurposeError = null; reqPurposeError = null;
descriptionError = null; descriptionError = null;
amountError = null; amountError = null;
...@@ -947,10 +972,97 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -947,10 +972,97 @@ class Requestionlistprovider extends ChangeNotifier {
} }
bool validateDirectForm(BuildContext context) { bool validateDirectForm(BuildContext context) {
selectAccountError = null;
selectDirectAccountError = null;
selectDirectPaymentAccountError = null;
reqPurposeError = null;
descriptionError = null;
amountError = null;
selectPaymentError = null;
bankNameError = null;
bankBranchError = null;
bankNumberError = null;
bankIFSCError = null;
bankHolderError = null;
paymentreferenceerror = null;
selectDirectPaymentError = null;
UPIError = null;
bool isValid = true;
if(_selectedDirectAccounts==null || _directAccountID.isEmpty){
selectDirectAccountError = "Please select an Account";
isValid = false;
}
if(_selectDirectPaymentAccounts==null || _directPaymentAccountsID.isEmpty){
selectDirectPaymentAccountError = "Please select an Account";
isValid = false;
}
bool isValid = true; if(amountController.text.trim().isEmpty){
amountError = "Please enter an amount";
isValid = false;
}
if(dateController.text.trim().isEmpty || _formattedDate!.isEmpty){
dateError = "Please select Date";
isValid = false;
}
if (_selectDirectPaymentModes == null || _directPaymentModesID.isEmpty) {
selectDirectPaymentError = "Please select a payment mode";
isValid = false;
}
if (["Cheque", "RTGS", "IMPS", "NEFT"].contains(_paymentModeValue)) {
if (bankNameController.text
.trim()
.isEmpty) {
bankNameError = "Please enter bank name";
isValid = false;
}
if (bankBranchController.text
.trim()
.isEmpty) {
bankBranchError = "Please enter bank branch";
isValid = false;
}
if (bankAccNumberController.text
.trim()
.isEmpty) {
bankNumberError = "Please enter account number";
isValid = false;
}
if (bankIfscController.text
.trim()
.isEmpty) {
bankIFSCError = "Please enter IFSC code";
isValid = false;
}
if (bankAcHolderController.text
.trim()
.isEmpty) {
bankHolderError = "Please enter account holder name";
isValid = false;
}
}
if (_paymentModeValue == "UPI") {
if (bankUpiController.text
.trim()
.isEmpty) {
UPIError = "Please enter UPI ID";
isValid = false;
}
}
if(paymentReferenceController.text.trim().isEmpty){
paymentreferenceerror = "please enter refernce number";
isValid = false;
}
if(descController.text.trim().isEmpty){
descriptionError = "Please Enter Description";
isValid = false;
}
// if (_image_picked == 0) {
// FileError = "Please attach a file";
// isValid = false;
// }
notifyListeners(); notifyListeners();
return isValid; return isValid;
} }
...@@ -964,6 +1076,10 @@ class Requestionlistprovider extends ChangeNotifier { ...@@ -964,6 +1076,10 @@ class Requestionlistprovider extends ChangeNotifier {
descriptionError = null; descriptionError = null;
notifyListeners(); notifyListeners();
} }
void updateReference(String value) {
paymentreferenceerror = null;
notifyListeners();
}
void updateAmount(String value) { void updateAmount(String value) {
amountError = null; amountError = null;
......
lib/Notifiers/financeProvider/paymentReceiptsProvider.dart
View file @ bf7b934c
...@@ -48,6 +48,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -48,6 +48,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{
TextEditingController bankAcHolderController = TextEditingController(); TextEditingController bankAcHolderController = TextEditingController();
TextEditingController bankUpiController = TextEditingController(); TextEditingController bankUpiController = TextEditingController();
TextEditingController paymentReferenceController = TextEditingController(); TextEditingController paymentReferenceController = TextEditingController();
TextEditingController dateController = TextEditingController();
// Date picker state // Date picker state
DateTime? _date; DateTime? _date;
String? _formattedDate; String? _formattedDate;
...@@ -100,15 +101,12 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -100,15 +101,12 @@ class Paymentreceiptsprovider extends ChangeNotifier{
String get receiptPaymentModesValues => _receiptPaymentModesValues; String get receiptPaymentModesValues => _receiptPaymentModesValues;
// Date picker methods // Date picker methods
void setDate(DateTime newDate) {
_date = newDate;
_formattedDate = DateFormat('yyyy-MM-dd').format(newDate);
notifyListeners();
}
set selectreceiptAccounts(Accounts? value) { set selectreceiptAccounts(Accounts? value) {
_selectedreceiptAccounts = value; _selectedreceiptAccounts = value;
_receiptAccountID = value!.id!; _receiptAccountID = value!.id!;
_receiptAccountValue = value!.name!; _receiptAccountValue = value!.name!;
selectAccountError = null;
notifyListeners(); notifyListeners();
} }
...@@ -116,6 +114,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -116,6 +114,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{
_selectreceiptPaymentAccounts = value; _selectreceiptPaymentAccounts = value;
_receiptPaymentAccountsID = value!.id!; _receiptPaymentAccountsID = value!.id!;
_receiptPaymentAccountsValue = value!.name!; _receiptPaymentAccountsValue = value!.name!;
selectPaymentAccountError = null;
notifyListeners(); notifyListeners();
} }
...@@ -123,6 +122,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -123,6 +122,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{
_selectreceiptPaymentModes = value; _selectreceiptPaymentModes = value;
_receiptPaymentModesID = value!.id!; _receiptPaymentModesID = value!.id!;
_receiptPaymentModesValues = value!.name!; _receiptPaymentModesValues = value!.name!;
paymentModeError = null;
notifyListeners(); notifyListeners();
} }
...@@ -148,6 +148,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -148,6 +148,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{
set receiptPaymentModesID(String value) { set receiptPaymentModesID(String value) {
_receiptPaymentModesID = value; _receiptPaymentModesID = value;
paymentModeError = null;
notifyListeners(); notifyListeners();
} }
...@@ -166,7 +167,10 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -166,7 +167,10 @@ class Paymentreceiptsprovider extends ChangeNotifier{
String _reqPurpose = ""; String _reqPurpose = "";
String? selectAccountError; String? selectAccountError;
String? selectPaymentAccountError;
String? reqPurposeError; String? reqPurposeError;
String? paymentModeError;
String? paymentreferenceError;
String? descriptionError; String? descriptionError;
String? amountError; String? amountError;
String? selectPaymentError; String? selectPaymentError;
...@@ -177,6 +181,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -177,6 +181,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{
String? bankHolderError; String? bankHolderError;
String? UPIError; String? UPIError;
String? FileError; String? FileError;
String? dateError;
bool buttonEnabled = false; bool buttonEnabled = false;
bool _isLoading = true; bool _isLoading = true;
...@@ -220,6 +225,19 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -220,6 +225,19 @@ class Paymentreceiptsprovider extends ChangeNotifier{
// _submitClicked = value; // _submitClicked = value;
// notifyListeners(); // notifyListeners();
// } // }
set formattedDate(String? value){
_formattedDate = value;
dateController.text = _formattedDate!;
dateError = null;
notifyListeners();
}
void setDate(DateTime newDate) {
_date = newDate;
_formattedDate = DateFormat('yyyy-MM-dd').format(newDate);
dateController.text = _formattedDate!;
dateError = null;
notifyListeners();
}
set selectedAccount(Accounts? value) { set selectedAccount(Accounts? value) {
_selectedAccounts = value; _selectedAccounts = value;
_accountId = value!.id!; _accountId = value!.id!;
...@@ -447,9 +465,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -447,9 +465,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{
bankUpiController.text, bankUpiController.text,
_image); _image);
if (data != null) { if (data != null) {
if (data['error'] == "0") { if (data.error == "0") {
print(data['error'] == "0");
toast(context, "Added Successfully"); toast(context, "Added Successfully");
resetForm(); resetForm();
Navigator.pop(context, true); Navigator.pop(context, true);
...@@ -663,11 +679,13 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -663,11 +679,13 @@ class Paymentreceiptsprovider extends ChangeNotifier{
bankIfscController.clear(); bankIfscController.clear();
bankAcHolderController.clear(); bankAcHolderController.clear();
bankUpiController.clear(); bankUpiController.clear();
paymentReferenceController.clear();
_selectedAccounts = null; dateController.clear();
_selectedPayment = null; _selectedreceiptAccounts = null;
_selectreceiptPaymentAccounts = null;
_selectreceiptPaymentModes = null;
_selectReqPurpose = null; _selectReqPurpose = null;
_formattedDate = "";
_paymentModeId = ""; _paymentModeId = "";
_paymentModeValue = ""; _paymentModeValue = "";
_accountId = ""; _accountId = "";
...@@ -680,7 +698,13 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -680,7 +698,13 @@ class Paymentreceiptsprovider extends ChangeNotifier{
// Clear validation errors // Clear validation errors
selectAccountError = null; selectAccountError = null;
selectreceiptPaymentAccounts = null;
selectPaymentAccountError = null;
dateError = null;
paymentreferenceError = null;
paymentModeError =null;
reqPurposeError = null; reqPurposeError = null;
paymentreferenceError = null;
descriptionError = null; descriptionError = null;
amountError = null; amountError = null;
selectPaymentError = null; selectPaymentError = null;
...@@ -692,14 +716,97 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -692,14 +716,97 @@ class Paymentreceiptsprovider extends ChangeNotifier{
UPIError = null; UPIError = null;
FileError = null; FileError = null;
buttonEnabled = false; buttonEnabled = false;
dateError = null;
notifyListeners(); notifyListeners();
} }
bool validatereceiptForm(BuildContext context) { bool validatereceiptForm(BuildContext context) {
selectAccountError = null;
selectPaymentAccountError = null;
reqPurposeError = null;
descriptionError = null;
amountError = null;
selectPaymentError = null;
bankNameError = null;
bankBranchError = null;
bankNumberError = null;
bankIFSCError = null;
bankHolderError = null;
paymentreferenceError = null;
UPIError = null;
bool isValid = true; bool isValid = true;
if(_selectedreceiptAccounts==null || _receiptAccountID.isEmpty){
selectAccountError = "Please select an Account";
isValid = false;
}
if(_selectreceiptPaymentAccounts==null || _receiptPaymentAccountsID.isEmpty){
selectPaymentAccountError = "Please select an Account";
isValid = false;
}
if(amountController.text.trim().isEmpty){
amountError = "Please enter an amount";
isValid = false;
}
if(dateController.text.trim().isEmpty || _formattedDate!.isEmpty){
dateError = "Please select Date";
isValid = false;
}
if (_selectreceiptPaymentModes == null || _receiptPaymentModesID.isEmpty) {
selectPaymentError = "Please select a payment mode";
isValid = false;
}
if (["Cheque", "RTGS", "IMPS", "NEFT"].contains(_paymentModeValue)) {
if (bankNameController.text
.trim()
.isEmpty) {
bankNameError = "Please enter bank name";
isValid = false;
}
if (bankBranchController.text
.trim()
.isEmpty) {
bankBranchError = "Please enter bank branch";
isValid = false;
}
if (bankAccNumberController.text
.trim()
.isEmpty) {
bankNumberError = "Please enter account number";
isValid = false;
}
if (bankIfscController.text
.trim()
.isEmpty) {
bankIFSCError = "Please enter IFSC code";
isValid = false;
}
if (bankAcHolderController.text
.trim()
.isEmpty) {
bankHolderError = "Please enter account holder name";
isValid = false;
}
}
if (_paymentModeValue == "UPI") {
if (bankUpiController.text
.trim()
.isEmpty) {
UPIError = "Please enter UPI ID";
isValid = false;
}
}
if(paymentReferenceController.text.trim().isEmpty){
paymentreferenceError = "please enter refernce number";
isValid = false;
}
if(descController.text.trim().isEmpty){
descriptionError = "Please Enter Description";
isValid = false;
}
notifyListeners(); notifyListeners();
return isValid; return isValid;
} }
...@@ -709,6 +816,10 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -709,6 +816,10 @@ class Paymentreceiptsprovider extends ChangeNotifier{
notifyListeners(); notifyListeners();
} }
void updatereference(String value) {
paymentreferenceError = null;
notifyListeners();
}
void updateDescription(String value) { void updateDescription(String value) {
descriptionError = null; descriptionError = null;
notifyListeners(); notifyListeners();
...@@ -794,7 +905,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{ ...@@ -794,7 +905,7 @@ class Paymentreceiptsprovider extends ChangeNotifier{
Expanded( Expanded(
flex: 3, flex: 3,
child: CupertinoDatePicker( child: CupertinoDatePicker(
minimumDate:_date ?? DateTime.now(),
initialDateTime: _date ?? DateTime.now(), initialDateTime: _date ?? DateTime.now(),
mode: CupertinoDatePickerMode.date, mode: CupertinoDatePickerMode.date,
use24hFormat: true, use24hFormat: true,
......
lib/screens/HomeScreen.dart
View file @ bf7b934c
...@@ -130,8 +130,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -130,8 +130,8 @@ class _MyHomePageState extends State<MyHomePage> {
"Nearby", "Nearby",
"Inventory", "Inventory",
"Whizzdom", "Whizzdom",
// "Common", "Common",
// "Finance", "Finance",
]; ];
final icons = [ final icons = [
"assets/svg/home_icons_1.svg", "assets/svg/home_icons_1.svg",
...@@ -141,8 +141,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -141,8 +141,8 @@ class _MyHomePageState extends State<MyHomePage> {
"assets/svg/home_icons_5.svg", "assets/svg/home_icons_5.svg",
"assets/svg/home_icons_6.svg", "assets/svg/home_icons_6.svg",
"assets/svg/home_icons_81.svg", "assets/svg/home_icons_81.svg",
// "assets/svg/home_icons_9.svg", "assets/svg/home_icons_9.svg",
// "assets/svg/home_icons_10.svg", "assets/svg/home_icons_10.svg",
]; ];
final requiredRoles = [ final requiredRoles = [
"430", "430",
...@@ -152,8 +152,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -152,8 +152,8 @@ class _MyHomePageState extends State<MyHomePage> {
"433", "433",
"432", "432",
"431", "431",
// "430", "430",
// "430", "430",
]; ];
final filteredItems = <Map<String, String>>[]; final filteredItems = <Map<String, String>>[];
......
lib/screens/commom/accountLedger.dart
View file @ bf7b934c
...@@ -27,6 +27,7 @@ class _AccountledgerState extends State<Accountledger> { ...@@ -27,6 +27,7 @@ class _AccountledgerState extends State<Accountledger> {
var provider = Provider.of<Accountledgerprovider>(context, listen: false); var provider = Provider.of<Accountledgerprovider>(context, listen: false);
provider.dropDownAPI(context); provider.dropDownAPI(context);
provider.ledgerlistAPI(context); provider.ledgerlistAPI(context);
_showFilterSheet(context);
}); });
} }
Future<bool> _onBackPressed(BuildContext context) async { Future<bool> _onBackPressed(BuildContext context) async {
......
lib/screens/commom/addCommonPayment.dart
View file @ bf7b934c
...@@ -139,23 +139,26 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -139,23 +139,26 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
], ],
), ),
), ),
ErrorWidget(context,provider.accountError),
textControllerWidget( textControllerWidget(
context, context,
provider.nameController, provider.nameController,
"Enter Name", "Enter Name",
(p0) { (p0) {
provider.updateName(p0);
provider.checkInputsAPI( provider.checkInputsAPI(
context, context,
"name", "name",
provider.nameController.text, provider.nameController.text,
); );
}, },
), ),ErrorWidget(context,provider.nameError),
textControllerWidget( textControllerWidget(
context, context,
provider.mobileController, provider.mobileController,
"Enter Mobile", "Enter Mobile",
(p0) { (p0) {
provider.updateMobile(p0);
provider.checkInputsAPI( provider.checkInputsAPI(
context, context,
"mob1", "mob1",
...@@ -163,6 +166,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -163,6 +166,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
); );
}, },
), ),
ErrorWidget(context,provider.mobileError),
Text("State"), Text("State"),
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
child: Row( child: Row(
...@@ -252,7 +256,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -252,7 +256,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
], ],
), ),
), ),
ErrorWidget(context,provider.stateError),
Text("District"), Text("District"),
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
child: Row( child: Row(
...@@ -343,6 +347,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -343,6 +347,7 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
], ],
), ),
), ),
ErrorWidget(context,provider.districtError),
Text("Sub Locality"), Text("Sub Locality"),
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
child: Row( child: Row(
...@@ -429,12 +434,14 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -429,12 +434,14 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
], ],
), ),
), ),
ErrorWidget(context,provider.localityError),
textControllerWidget( textControllerWidget(
context, context,
provider.addressController, provider.addressController,
"Enter Address", "Enter Address",
(p0) {}, provider.updateAddress,
), ),
ErrorWidget(context,provider.addressError),
], ],
), ),
), ),
...@@ -477,38 +484,44 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -477,38 +484,44 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
context, context,
provider.bankNameController, provider.bankNameController,
"Bank Name", "Bank Name",
(p0) {}, provider.updateBankName,
), ),
ErrorWidget(context,provider.banknameError),
textControllerWidget( textControllerWidget(
context, context,
provider.branchNameController, provider.branchNameController,
"Bank Branch", "Bank Branch",
(p0) {}, provider.updateBankBranch,
), ),
ErrorWidget(context,provider.bankBranchError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankIfscCotroller, provider.bankIfscCotroller,
"Bank IFSC", "Bank IFSC",
(p0) {}, provider.updateIFSC,
), ),
ErrorWidget(context,provider.bankIFSCError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankHolderNameController, provider.bankHolderNameController,
"Bank Holder Name", "Bank Holder Name",
(p0) {}, provider.updateHolder,
), ),
ErrorWidget(context,provider.bankHolderNameError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAcNameController, provider.bankAcNumberController,
"Bank Account Name", "Bank Account Number",
(p0) {}, provider.updateNumber,
), ),
ErrorWidget(context,provider.bankAcNumberError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankUpiController, provider.bankUpiController,
"Bank UPI ID", "Bank UPI ID",
(p0) {}, provider.updateUPI,
), ),
ErrorWidget(context,provider.upiError),
], ],
), ),
), ),
...@@ -531,34 +544,40 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -531,34 +544,40 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
context, context,
provider.contactPersonController, provider.contactPersonController,
"Contact Person Name", "Contact Person Name",
(p0) {}, provider.updateContactPerson,
), ),
ErrorWidget(context,provider.contactPersonError),
textControllerWidget( textControllerWidget(
context, context,
provider.contectPersonDesignationController, provider.contectPersonDesignationController,
"Contact Person Designation", "Contact Person Designation",
(p0) {}, provider.updateDesignation,
), ),
ErrorWidget(context,provider.desigantionError),
textControllerWidget( textControllerWidget(
context, context,
provider.contectPersonAltMobController, provider.contectPersonAltMobController,
"Alternative Mobile Number", "Alternative Mobile Number",
(p0) { (p0) {
provider.updateAltMobile(p0);
provider.checkInputsAPI(context, "mob2", provider.contectPersonAltMobController.text); provider.checkInputsAPI(context, "mob2", provider.contectPersonAltMobController.text);
}, },
), ),
ErrorWidget(context,provider.altMobError),
textControllerWidget( textControllerWidget(
context, context,
provider.contectPersonTeleController, provider.contectPersonTeleController,
"Telephone Number", "Telephone Number",
(p0) {}, provider.updateTeleMobile,
), ),
ErrorWidget(context,provider.teleError),
textControllerWidget( textControllerWidget(
context, context,
provider.contectPersonMailController, provider.contectPersonMailController,
"Customer Mail ID", "Customer Mail ID",
(p0) {}, provider.updateMail,
), ),
ErrorWidget(context,provider.mailError),
], ],
), ),
) )
...@@ -602,7 +621,12 @@ class _AddcommonpaymentState extends State<Addcommonpayment> { ...@@ -602,7 +621,12 @@ class _AddcommonpaymentState extends State<Addcommonpayment> {
}, },
); );
} }
Widget ErrorWidget(context, text) {
if (text != null)
return Text(text!, style: TextStyle(color: Colors.red, fontSize: 12));
else
return SizedBox(height: 10);
}
Widget textControllerWidget( Widget textControllerWidget(
context, context,
controller, controller,
......
lib/screens/finance/addPaymentReceiptList.dart
View file @ bf7b934c
...@@ -145,7 +145,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -145,7 +145,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
], ],
), ),
), ),
ErrorWidget(context, provider.selectAccountError),
TextWidget(context, "Payment Account"), TextWidget(context, "Payment Account"),
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
child: Row( child: Row(
...@@ -240,6 +240,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -240,6 +240,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
], ],
), ),
), ),
ErrorWidget(context, provider.selectPaymentAccountError),
textControllerWidget( textControllerWidget(
context, context,
...@@ -247,39 +248,58 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -247,39 +248,58 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
"Enter Amount", "Enter Amount",
provider.updateAmount, provider.updateAmount,
), ),
ErrorWidget(context, provider.amountError),
///payment date toBE ///payment date toBE
TextWidget(context, "Receipt Date"), TextWidget(context, "Receipt Date"),
Row( GestureDetector(
crossAxisAlignment: CrossAxisAlignment.center, onTap: () {
children: [ provider.showDatePickerDialog(context);
Expanded(
child: InkResponse( },
onTap: () async { child: Row(
provider.showDatePickerDialog(context); crossAxisAlignment: CrossAxisAlignment.center,
}, children: [
Expanded(
child: Container( child: Container(
padding: EdgeInsets.only(left: 10),
height:48, height: 50,
alignment: Alignment.centerLeft, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(14), color: AppColors.text_field_color,
color: AppColors.text_field_color borderRadius: BorderRadius.circular(14),
), ),
child: Text( child: Padding(
'${provider.formattedDate ?? 'Select Date'}', padding: const EdgeInsets.fromLTRB(10.0, 0.0, 10, 0),
style: TextStyle( child: TextFormField(
fontSize: 14, controller: provider.dateController,
fontFamily: keyboardType: TextInputType.text,
"JakartaMedium", enabled: false,
color: AppColors.semi_black, maxLines: 1,
readOnly: true,
onChanged: (value) {
},
decoration: InputDecoration(
hintText: "Enter Date",
hintStyle: TextStyle(
fontWeight: FontWeight.w400,
color: Color(0xFFB4BEC0),
fontSize: 14,
),
enabledBorder: InputBorder.none,
disabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
),
), ),
), ),
), ),
), ),
), ],
], ),
), ),
ErrorWidget(context, provider.dateError),
TextWidget(context, "Select Payment Mode"), TextWidget(context, "Select Payment Mode"),
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
child: Row( child: Row(
...@@ -370,7 +390,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -370,7 +390,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
], ],
), ),
), ),
ErrorWidget(context, provider.paymentModeError),
if ([ if ([
"Cheque", "Cheque",
"RTGS", "RTGS",
...@@ -384,34 +404,35 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -384,34 +404,35 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
"Enter Bank Name", "Enter Bank Name",
provider.updateBankName, provider.updateBankName,
), ),
ErrorWidget(context, provider.bankNameError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankBranchController, provider.bankBranchController,
"Enter Bank Branch", "Enter Bank Branch",
provider.updateBankBranch, provider.updateBankBranch,
), ),
ErrorWidget(context, provider.bankBranchError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAccNumberController, provider.bankAccNumberController,
"Enter Account Number", "Enter Account Number",
provider.updateNumber, provider.updateNumber,
), ),
ErrorWidget(context, provider.bankNumberError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankIfscController, provider.bankIfscController,
"Enter Bank IFSC", "Enter Bank IFSC",
provider.updateIFSC, provider.updateIFSC,
), ),
ErrorWidget(context, provider.bankIFSCError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAcHolderController, provider.bankAcHolderController,
"Enter Bank Account Holder Name", "Enter Bank Account Holder Name",
provider.updateHolder, provider.updateHolder,
), ),
ErrorWidget(context, provider.bankHolderError),
] else if (provider.paymentModeValue == "UPI") ... ] else if (provider.paymentModeValue == "UPI") ...
[ [
textControllerWidget( textControllerWidget(
...@@ -420,20 +441,22 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -420,20 +441,22 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
"Enter UPI ID", "Enter UPI ID",
provider.updateUPI, provider.updateUPI,
), ),
ErrorWidget(context, provider.UPIError),
], ],
textControllerWidget( textControllerWidget(
context, context,
provider.paymentReferenceController, provider.paymentReferenceController,
"Enter Payment Reference Number", "Enter Payment Reference Number",
provider.updateDescription, provider.updatereference,
), ),
ErrorWidget(context, provider.paymentreferenceError),
textControllerWidget( textControllerWidget(
context, context,
provider.descController, provider.descController,
"Enter Description", "Enter Description",
provider.updateDescription, provider.updateDescription,
), ),
ErrorWidget(context, provider.descriptionError),
InkResponse( InkResponse(
onTap: () { onTap: () {
_showAttachmentSheet(context); _showAttachmentSheet(context);
...@@ -475,7 +498,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -475,7 +498,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
child: Container( child: Container(
height: 45, height: 45,
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.symmetric(horizontal: 10), margin: EdgeInsets.symmetric(horizontal: 10,vertical: 15),
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.app_blue, color: AppColors.app_blue,
...@@ -492,14 +515,15 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> { ...@@ -492,14 +515,15 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
), ),
), ),
), ),
onWillPop: () { onWillPop: () async {
provider.resetForm(); provider.resetForm();
return onBackPressed(context); return _onBackPressed(context);
}, },
); );
}, },
); );
} }
void _showDialog(Widget child) { void _showDialog(Widget child) {
showCupertinoModalPopup<void>( showCupertinoModalPopup<void>(
context: context, context: context,
......
lib/screens/finance/directPaymentRequesitionList.dart
View file @ bf7b934c
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
], ],
), ),
), ),
ErrorWidget(context, provider.selectDirectAccountError),
TextWidget(context, "Payment Account"), TextWidget(context, "Payment Account"),
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
child: Row( child: Row(
...@@ -244,46 +244,64 @@ ...@@ -244,46 +244,64 @@
], ],
), ),
), ),
ErrorWidget(context, provider.selectDirectPaymentAccountError),
textControllerWidget( textControllerWidget(
context, context,
provider.amountController, provider.amountController,
"Enter Amount", "Enter Amount",
provider.updateAmount, provider.updateAmount,
), ),
ErrorWidget(context, provider.amountError),
///payment date toBE ///payment date toBE
TextWidget(context, "Enter Date"), TextWidget(context, "Enter Date"),
Row( GestureDetector(
crossAxisAlignment: CrossAxisAlignment.center, onTap: () {
children: [ provider.showDatePickerDialog(context);
Expanded(
child: InkResponse( },
onTap: () async { child: Row(
provider.showDatePickerDialog(context); crossAxisAlignment: CrossAxisAlignment.center,
}, children: [
Expanded(
child: Container( child: Container(
padding: EdgeInsets.only(left: 10),
height:48, height: 50,
alignment: Alignment.centerLeft, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.text_field_color,
borderRadius: BorderRadius.circular(14), borderRadius: BorderRadius.circular(14),
color: AppColors.text_field_color
), ),
child: Text( child: Padding(
'${provider.formattedDate ?? 'Select Date'}', padding: const EdgeInsets.fromLTRB(10.0, 0.0, 10, 0),
style: TextStyle( child: TextFormField(
fontSize: 14, controller: provider.dateController,
fontFamily: keyboardType: TextInputType.text,
"JakartaMedium", enabled: false,
color: AppColors.semi_black, maxLines: 1,
readOnly: true,
onChanged: (value) {
},
decoration: InputDecoration(
hintText: "Enter Date",
hintStyle: TextStyle(
fontWeight: FontWeight.w400,
color: Color(0xFFB4BEC0),
fontSize: 14,
),
enabledBorder: InputBorder.none,
disabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
),
), ),
), ),
), ),
), ),
), ],
], ),
), ),
ErrorWidget(context, provider.dateError),
TextWidget(context, "Select Payment Mode"), TextWidget(context, "Select Payment Mode"),
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
child: Row( child: Row(
...@@ -374,13 +392,13 @@ ...@@ -374,13 +392,13 @@
], ],
), ),
), ),
ErrorWidget(context, provider.selectDirectPaymentError),
if ([ if ([
"Cheque", "Cheque",
"RTGS", "RTGS",
"IMPS", "IMPS",
"NEFT", "NEFT",
].contains(provider.paymentModeValue)) ... ].contains(provider.directPaymentModesValues)) ...
[ [
textControllerWidget( textControllerWidget(
context, context,
...@@ -388,35 +406,36 @@ ...@@ -388,35 +406,36 @@
"Enter Bank Name", "Enter Bank Name",
provider.updateBankName, provider.updateBankName,
), ),
ErrorWidget(context, provider.bankNameError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankBranchController, provider.bankBranchController,
"Enter Bank Branch", "Enter Bank Branch",
provider.updateBankBranch, provider.updateBankBranch,
), ),
ErrorWidget(context, provider.bankBranchError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAccNumberController, provider.bankAccNumberController,
"Enter Account Number", "Enter Account Number",
provider.updateNumber, provider.updateNumber,
), ),
ErrorWidget(context, provider.bankNumberError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankIfscController, provider.bankIfscController,
"Enter Bank IFSC", "Enter Bank IFSC",
provider.updateIFSC, provider.updateIFSC,
), ),
ErrorWidget(context, provider.bankIFSCError),
textControllerWidget( textControllerWidget(
context, context,
provider.bankAcHolderController, provider.bankAcHolderController,
"Enter Bank Account Holder Name", "Enter Bank Account Holder Name",
provider.updateHolder, provider.updateHolder,
), ),ErrorWidget(context, provider.bankHolderError),
] else if (provider.paymentModeValue == "UPI") ... ]
else if (provider.directPaymentModesValues == "UPI") ...
[ [
textControllerWidget( textControllerWidget(
context, context,
...@@ -424,20 +443,22 @@ ...@@ -424,20 +443,22 @@
"Enter UPI ID", "Enter UPI ID",
provider.updateUPI, provider.updateUPI,
), ),
ErrorWidget(context, provider.UPIError),
], ],
textControllerWidget( textControllerWidget(
context, context,
provider.paymentReferenceController, provider.paymentReferenceController,
"Enter Payment Reference Number", "Enter Payment Reference Number",
provider.updateDescription, provider.updateReference,
), ),
ErrorWidget(context, provider.paymentreferenceerror),
textControllerWidget( textControllerWidget(
context, context,
provider.descController, provider.descController,
"Enter Description", "Enter Description",
provider.updateDescription, provider.updateDescription,
), ),
ErrorWidget(context, provider.descriptionError),
InkResponse( InkResponse(
onTap: () { onTap: () {
_showAttachmentSheet(context); _showAttachmentSheet(context);
...@@ -479,7 +500,7 @@ ...@@ -479,7 +500,7 @@
child: Container( child: Container(
height: 45, height: 45,
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.symmetric(horizontal: 10), margin: EdgeInsets.symmetric(horizontal: 10,vertical: 15),
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.app_blue, color: AppColors.app_blue,
......
lib/services/api_calling.dart
View file @ bf7b934c
...@@ -1240,7 +1240,7 @@ class ApiCalling { ...@@ -1240,7 +1240,7 @@ class ApiCalling {
} }
} }
static addPaymentRequestionSubmitAPI( static Future<addReceiptPaymentResponse?> addPaymentRequestionSubmitAPI(
emp_id, emp_id,
session_id, session_id,
type, type,
...@@ -1287,7 +1287,8 @@ class ApiCalling { ...@@ -1287,7 +1287,8 @@ class ApiCalling {
res = jsonDecode(res); res = jsonDecode(res);
} else { } else {
res = await post(data, addPaymentRequestionSubmitUrl, {}); res = await post(data, addPaymentRequestionSubmitUrl, {});
res = jsonDecode(res); res = jsonDecode(res.body);
return addReceiptPaymentResponse.fromJson(res);
} }
if (res != null) { if (res != null) {
return res; return res;
...@@ -1301,7 +1302,7 @@ class ApiCalling { ...@@ -1301,7 +1302,7 @@ class ApiCalling {
} }
} }
static addDirectPaymentRequestionSubmitAPI( static Future<addDirectPaymentResponse?> addDirectPaymentRequestionSubmitAPI(
emp_id, emp_id,
session_id, session_id,
from_account_id, from_account_id,
...@@ -1337,7 +1338,8 @@ class ApiCalling { ...@@ -1337,7 +1338,8 @@ class ApiCalling {
'acc_holder_name': acc_holder_name.toString(), 'acc_holder_name': acc_holder_name.toString(),
'bank_upi_id': bank_upi_id.toString(), 'bank_upi_id': bank_upi_id.toString(),
}; };
print(data);
print(attachment);
var res; var res;
if (attachment != null) { if (attachment != null) {
res = await postImageNew( res = await postImageNew(
...@@ -1350,7 +1352,11 @@ class ApiCalling { ...@@ -1350,7 +1352,11 @@ class ApiCalling {
res = jsonDecode(res); res = jsonDecode(res);
} else { } else {
res = await post(data, addDirectPaymentRequestionSubmitUrl, {}); res = await post(data, addDirectPaymentRequestionSubmitUrl, {});
res = jsonDecode(res); res = jsonDecode(res.body);
print(res);
return addDirectPaymentResponse.fromJson(res);
} }
if (res != null) { if (res != null) {
return res; return res;
...@@ -1364,7 +1370,7 @@ class ApiCalling { ...@@ -1364,7 +1370,7 @@ class ApiCalling {
} }
} }
static addReceiptPaymentRequestionSubmitAPI( static Future<addReceiptPaymentResponse?> addReceiptPaymentRequestionSubmitAPI(
emp_id, emp_id,
session_id, session_id,
from_account_id, from_account_id,
...@@ -1413,7 +1419,8 @@ class ApiCalling { ...@@ -1413,7 +1419,8 @@ class ApiCalling {
res = jsonDecode(res); res = jsonDecode(res);
} else { } else {
res = await post(data, addPaymentReceiptSubmitUrl, {}); res = await post(data, addPaymentReceiptSubmitUrl, {});
res = jsonDecode(res); res = jsonDecode(res.body);
return addReceiptPaymentResponse.fromJson(res);
} }
if (res != null) { if (res != null) {
return res; return res;
...@@ -1607,7 +1614,8 @@ class ApiCalling { ...@@ -1607,7 +1614,8 @@ class ApiCalling {
res = jsonDecode(res); res = jsonDecode(res);
} else { } else {
res = await post(data, approveRejectPaymentRequestSubmitUrl, {}); res = await post(data, approveRejectPaymentRequestSubmitUrl, {});
res = jsonDecode(res); res = jsonDecode(res.body);
return approveRejectPaymentRequestResponse.fromJson(res);
} }
} catch (e) { } catch (e) {
debugPrint('hello bev=bug $e '); debugPrint('hello bev=bug $e ');
......
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