Skip to content

GitLab

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

ios changes in Navigation swipe gestures.

parent ee178d55
Expand all Show whitespace changes
Inline Side-by-side
lib/screens/crm/prospectOrderDetails.dart
View file @ c92f4c79
import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart';
import 'package:generp/Utils/commonServices.dart';
import 'package:generp/screens/order/ordersDetailsByModes.dart';
import 'package:provider/provider.dart';
......@@ -10,17 +12,24 @@ import '../../Utils/commonWidgets.dart';
class ProspectOrderDetails extends StatefulWidget {
final leadID;
const ProspectOrderDetails({super.key,required this.leadID});
const ProspectOrderDetails({super.key, required this.leadID});
@override
State<ProspectOrderDetails> createState() => _ProspectOrderDetailsState();
}
class _ProspectOrderDetailsState extends State<ProspectOrderDetails> {
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override
void initState() {
// TODO: implement initState
super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
final provider = Provider.of<crmProspectDetailsProvider>(
context,
......@@ -29,26 +38,56 @@ class _ProspectOrderDetailsState extends State<ProspectOrderDetails> {
});
}
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
@override
Widget build(BuildContext context) {
return Consumer<crmProspectDetailsProvider>(
builder: (context, provider, child) {
var customerDetails = provider.ordersList;
return WillPopScope(
switch (_source.keys.toList()[0]) {
case ConnectivityResult.mobile:
connection = 'Online';
break;
case ConnectivityResult.wifi:
connection = 'Online';
break;
case ConnectivityResult.none:
default:
connection = 'Offline';
}
return (connection == "Online")
? Platform.isAndroid
? WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
bottom: true,
child: _scaffold(context),
),
)
: _scaffold(context)
: NoNetwork(context);
}
Widget _scaffold(BuildContext context) {
return Consumer<crmProspectDetailsProvider>(
builder: (context, provider, child) {
var customerDetails = provider.ordersList;
return Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Order Details"),
backgroundColor: AppColors.scaffold_bg_color,
body: SizedBox(
body:
customerDetails.isNotEmpty
? SizedBox(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TextWidget(context, "Order Details"),
// TextWidget(context, "Order Details"),
ListView.builder(
itemCount: customerDetails.length,
shrinkWrap: true,
......@@ -77,7 +116,8 @@ class _ProspectOrderDetailsState extends State<ProspectOrderDetails> {
];
final textSubheads = [
customerDetails[index].id ?? "-",
customerDetails[index].createdDatetime ?? "-",
customerDetails[index].createdDatetime ??
"-",
customerDetails[index].status ?? "-",
"View",
];
......@@ -107,8 +147,9 @@ class _ProspectOrderDetailsState extends State<ProspectOrderDetails> {
context,
MaterialPageRoute(
builder:
(context) =>
Ordersdetailsbymodes(
(
context,
) => Ordersdetailsbymodes(
mode: "",
pageTitleName:
"Order Details",
......@@ -130,13 +171,15 @@ class _ProspectOrderDetailsState extends State<ProspectOrderDetails> {
? "-"
: textSubheads[j],
maxLines: 2,
overflow: TextOverflow.ellipsis,
overflow:
TextOverflow.ellipsis,
style: TextStyle(
color: AppColors.app_blue,
decorationColor:
AppColors.app_blue,
decoration:
TextDecoration.underline,
TextDecoration
.underline,
),
),
),
......@@ -169,10 +212,8 @@ class _ProspectOrderDetailsState extends State<ProspectOrderDetails> {
],
),
),
),
),
),
)
: Emptywidget(context),
);
},
);
......
lib/screens/crm/prospectPaymentDetails.dart
View file @ c92f4c79
import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart';
import 'package:generp/Utils/commonServices.dart';
import 'package:generp/screens/order/paymentDetailsByMode.dart';
import 'package:provider/provider.dart';
......@@ -18,10 +20,17 @@ class ProspectPaymentDetails extends StatefulWidget {
}
class _ProspectPaymentDetailsState extends State<ProspectPaymentDetails> {
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
@override
void initState() {
// TODO: implement initState
super.initState();
_connectivity.initialise();
_connectivity.myStream.listen((source) {
setState(() => _source = source);
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
final provider = Provider.of<crmProspectDetailsProvider>(
context,
......@@ -30,27 +39,56 @@ class _ProspectPaymentDetailsState extends State<ProspectPaymentDetails> {
});
}
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_connectivity.disposeStream();
}
@override
Widget build(BuildContext context) {
return Consumer<crmProspectDetailsProvider>(
builder: (context, provider, child) {
var customerDetails = provider.paymentsList;
return WillPopScope(
switch (_source.keys.toList()[0]) {
case ConnectivityResult.mobile:
connection = 'Online';
break;
case ConnectivityResult.wifi:
connection = 'Online';
break;
case ConnectivityResult.none:
default:
connection = 'Offline';
}
return (connection == "Online")
? Platform.isAndroid
? WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
bottom: true,
child: _scaffold(context),
),
)
: _scaffold(context)
: NoNetwork(context);
}
child: Scaffold(
Widget _scaffold(BuildContext context) {
return Consumer<crmProspectDetailsProvider>(
builder: (context, provider, child) {
var customerDetails = provider.paymentsList;
return Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar(context, "Payment Details"),
backgroundColor: AppColors.scaffold_bg_color,
body: SizedBox(
body:
customerDetails.isNotEmpty
? SizedBox(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TextWidget(context, "Payment Details"),
// TextWidget(context, "Payment Details"),
ListView.builder(
itemCount: customerDetails.length,
shrinkWrap: true,
......@@ -77,13 +115,14 @@ class _ProspectPaymentDetailsState extends State<ProspectPaymentDetails> {
"Amount",
"Entered By Employee",
"Payment Received Date",
"Action"
"Action",
];
final textSubheads = [
customerDetails[index].paymentType ?? "-",
customerDetails[index].refNo ?? "-",
customerDetails[index].amount ?? "-",
customerDetails[index].employeeName ?? "-",
customerDetails[index].employeeName ??
"-",
customerDetails[index].paymentDate ?? "-",
"View Details",
];
......@@ -104,7 +143,8 @@ class _ProspectPaymentDetailsState extends State<ProspectPaymentDetails> {
overflow: TextOverflow.ellipsis,
),
),
if (textSubheads[j] == "View Details") ...[
if (textSubheads[j] ==
"View Details") ...[
Expanded(
flex: 3,
child: InkResponse(
......@@ -113,8 +153,9 @@ class _ProspectPaymentDetailsState extends State<ProspectPaymentDetails> {
context,
MaterialPageRoute(
builder:
(context) =>
Paymentdetailsbymode(
(
context,
) => Paymentdetailsbymode(
mode: "",
pageTitleName:
"Payment Details",
......@@ -137,19 +178,20 @@ class _ProspectPaymentDetailsState extends State<ProspectPaymentDetails> {
? "-"
: textSubheads[j],
maxLines: 2,
overflow: TextOverflow.ellipsis,
overflow:
TextOverflow.ellipsis,
style: TextStyle(
color: AppColors.app_blue,
decorationColor:
AppColors.app_blue,
decoration:
TextDecoration.underline,
TextDecoration
.underline,
),
),
),
),
] else
...[
] else ...[
Expanded(
flex: 3,
child: Text(
......@@ -177,9 +219,8 @@ class _ProspectPaymentDetailsState extends State<ProspectPaymentDetails> {
],
),
),
),
),
),
)
: Emptywidget(context),
);
},
);
......
lib/screens/finance/AllPaymentRequesitionListsByModes.dart
View file @ c92f4c79
......@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/financeProvider/RequestionListProvider.dart';
import 'package:generp/Utils/GlobalConstants.dart';
import 'package:generp/Utils/app_colors.dart';
import 'package:generp/Utils/commonWidgets.dart';
import 'package:generp/screens/finance/FileViewer.dart';
......@@ -32,7 +33,6 @@ class Allpaymentrequesitionlistsbymodes extends StatefulWidget {
class _AllpaymentrequesitionlistsbymodesState
extends State<Allpaymentrequesitionlistsbymodes> {
Map _source = {ConnectivityResult.mobile: true};
final MyConnectivity _connectivity = MyConnectivity.instance;
......@@ -58,7 +58,7 @@ class _AllpaymentrequesitionlistsbymodesState
);
final dateRange = cf.getFormattedDateRange(range);
// print(dateRange);
provider.paymentRequestionListsAPIFunction(context, widget.mode, "","");
provider.paymentRequestionListsAPIFunction(context, widget.mode, "", "");
});
}
......@@ -82,17 +82,27 @@ class _AllpaymentrequesitionlistsbymodesState
default:
connection = 'Offline';
}
return connection=="Online"?Consumer<Requestionlistprovider>(
builder: (context, provider, child) {
final requestLists = provider.requisitionList;
return WillPopScope(
return connection == "Online"
? Platform.isAndroid
? WillPopScope(
onWillPop: () {
return onBackPressed(context);
},
child: SafeArea(
top: false,
bottom: Platform.isIOS?false:true,
child: Scaffold(
bottom: true,
child: _scaffold(context),
),
)
: _scaffold(context)
: NoNetwork(context);
}
Widget _scaffold(BuildContext context) {
return Consumer<Requestionlistprovider>(
builder: (context, provider, child) {
final requestLists = provider.requisitionList;
return Scaffold(
resizeToAvoidBottomInset: true,
appBar: appbar2(
context,
......@@ -106,7 +116,6 @@ class _AllpaymentrequesitionlistsbymodesState
// },
// child: SvgPicture.asset("assets/svg/ic_download.svg",),
// ),
InkResponse(
onTap: () async {
var cf = Commondaterangefilter();
......@@ -138,7 +147,10 @@ class _AllpaymentrequesitionlistsbymodesState
print("Bottom sheet closed without selection");
}
},
child:SvgPicture.asset("assets/svg/filter_ic.svg",height: 25,),
child: SvgPicture.asset(
"assets/svg/filter_ic.svg",
height: 25,
),
),
],
),
......@@ -146,11 +158,15 @@ class _AllpaymentrequesitionlistsbymodesState
backgroundColor: AppColors.scaffold_bg_color,
body:
provider.isLoading
? Center(child: CircularProgressIndicator.adaptive(
? Center(
child: CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>(
AppColors.app_blue)
))
: requestLists.isNotEmpty?SizedBox(
AppColors.app_blue,
),
),
)
: requestLists.isNotEmpty
? SizedBox(
child: Scrollbar(
thumbVisibility: false,
child: ListView.builder(
......@@ -160,9 +176,7 @@ class _AllpaymentrequesitionlistsbymodesState
itemBuilder: (context, index) {
if (requestLists.isEmpty) {
return SizedBox(
child: Center(
child: Text("No Data Available"),
),
child: Center(child: Text("No Data Available")),
);
}
return Container(
......@@ -190,8 +204,9 @@ class _AllpaymentrequesitionlistsbymodesState
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Color(0xFFFFF3CE),
borderRadius:
BorderRadius.circular(8),
borderRadius: BorderRadius.circular(
8,
),
),
child: SvgPicture.asset(
"assets/svg/fin_ic.svg",
......@@ -207,22 +222,18 @@ class _AllpaymentrequesitionlistsbymodesState
CrossAxisAlignment.start,
children: [
Text(
requestLists[index]
.accountName!,
requestLists[index].accountName!,
style: TextStyle(
fontFamily:
"JakartaMedium",
fontFamily: "JakartaMedium",
fontSize: 14,
color:
AppColors.semi_black,
color: AppColors.semi_black,
),
),
Text(
"₹"
"${requestLists[index].amount}",
style: TextStyle(
fontFamily:
"JakartaMedium",
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.app_blue,
),
......@@ -239,8 +250,9 @@ class _AllpaymentrequesitionlistsbymodesState
vertical: 10,
),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(8),
borderRadius: BorderRadius.circular(
8,
),
color: Color(0xFFE3FFE0),
),
child: Center(
......@@ -277,14 +289,14 @@ class _AllpaymentrequesitionlistsbymodesState
requestLists[index].date,
requestLists[index].description,
];
if(j==1&&requestLists[index]
.attachmentViewFileName==""){
if (j == 1 &&
requestLists[index]
.attachmentViewFileName ==
"") {
return SizedBox.shrink();
}
return Container(
padding: EdgeInsets.symmetric(
vertical: 5,
),
padding: EdgeInsets.symmetric(vertical: 5),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
......@@ -328,21 +340,16 @@ class _AllpaymentrequesitionlistsbymodesState
fontSize: 14,
color:
j == 1
? AppColors
.app_blue
: Color(
0xFF818181,
),
? AppColors.app_blue
: Color(0xFF818181),
decoration:
j == 1
? TextDecoration
.underline
: TextDecoration
.none,
: TextDecoration.none,
decorationColor:
j == 1
? AppColors
.app_blue
? AppColors.app_blue
: AppColors.white,
),
),
......@@ -361,23 +368,53 @@ class _AllpaymentrequesitionlistsbymodesState
(context) =>
Paymentrequestionlistdetails(
pageName:
widget
.pageTitleName,
widget.pageTitleName,
mode: widget.mode,
paymentRequestId:
requestLists[index]
.id,
requestLists[index].id,
),
settings: RouteSettings(
name: "Paymentrequestionlistdetails",
),
),
);
if(res==true){
provider.paymentRequestionListsAPIFunction(context, widget.mode, "","");
if (routeSettingName ==
"Paymentrequestionlistdetails") {
print("croos refresh");
provider
.paymentRequestionListsAPIFunction(
context,
widget.mode,
"",
"",
);
}
// if (res == true) {
// print("android refresh");
// provider
// .paymentRequestionListsAPIFunction(
// context,
// widget.mode,
// "",
// "",
// );
// }
// if (Platform.isIOS) {
// print("IOS Refresh");
// if (didPushed == "true" ||
// didPopped == "true") {
// provider
// .paymentRequestionListsAPIFunction(
// context,
// widget.mode,
// "",
// "",
// );
// }
// }
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 5,
),
padding: EdgeInsets.symmetric(vertical: 5),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.center,
......@@ -406,12 +443,11 @@ class _AllpaymentrequesitionlistsbymodesState
},
),
),
):Emptywidget(context)
),
),
)
: Emptywidget(context),
);
},
):NoNetwork(context);
);
}
Future<void> _showOptionsSheet(BuildContext context) {
......@@ -436,7 +472,9 @@ class _AllpaymentrequesitionlistsbymodesState
right: 15,
top: 10,
),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,),
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom,
),
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
......
lib/screens/finance/addPaymentReceiptList.dart
View file @ c92f4c79
......@@ -71,13 +71,24 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
default:
connection = 'Offline';
}
return connection=="Online"?Consumer<Paymentreceiptsprovider>(
builder: (context, provider, child) {
return WillPopScope(
return (connection == "Online")
? Platform.isAndroid
? WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS ? false : true,
child: Scaffold(
bottom: true,
child: _scaffold(context),
),
)
: _scaffold(context)
: NoNetwork(context);
}
Widget _scaffold(BuildContext context) {
return Consumer<Paymentreceiptsprovider>(
builder: (context, provider, child) {
return Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white,
appBar: appbar2(
......@@ -115,9 +126,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
value: accs,
child: Text(
accs.name ?? '',
style: const TextStyle(
fontSize: 14,
),
style: const TextStyle(fontSize: 14),
overflow: TextOverflow.ellipsis,
),
),
......@@ -133,12 +142,10 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
"Selected Complaint Type: ${value.name}, ID: ${value.id}",
);
provider.receiptAccountId = value.id!;
provider.receiptAccountValue =
value.name!;
provider.receiptAccountValue = value.name!;
print(
"hfjkshfg" +
provider.receiptAccountId
.toString(),
provider.receiptAccountId.toString(),
);
}
}
......@@ -150,28 +157,22 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
searchInnerWidget: Padding(
padding: const EdgeInsets.all(8),
child: TextFormField(
controller:
provider.accountSearchController,
controller: provider.accountSearchController,
decoration: InputDecoration(
isDense: true,
contentPadding:
const EdgeInsets.symmetric(
contentPadding: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 8,
),
hintText: 'Search account...',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(
8,
),
borderRadius: BorderRadius.circular(8),
),
),
),
),
searchMatchFn: (item, searchValue) {
return item.value?.name
?.toLowerCase()
.contains(
return item.value?.name?.toLowerCase().contains(
searchValue.toLowerCase(),
) ??
false;
......@@ -217,8 +218,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
style: const TextStyle(
fontSize: 14,
),
overflow:
TextOverflow.ellipsis,
overflow: TextOverflow.ellipsis,
),
),
)
......@@ -229,13 +229,11 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
if (provider
.receiptPaymentAccounts
.isNotEmpty) {
provider.selectreceiptPaymentAccounts =
value;
provider.selectreceiptPaymentAccounts = value;
print(
"Selected Complaint Type: ${value.name}, ID: ${value.id}",
);
provider.receiptPaymentAccountsID =
value.id!;
provider.receiptPaymentAccountsID = value.id!;
provider.receiptPaymentAccountsValue =
value.name!;
print(
......@@ -254,28 +252,22 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
padding: const EdgeInsets.all(8),
child: TextFormField(
controller:
provider
.paymentAccountSearchController,
provider.paymentAccountSearchController,
decoration: InputDecoration(
isDense: true,
contentPadding:
const EdgeInsets.symmetric(
contentPadding: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 8,
),
hintText: 'Search account...',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(
8,
),
borderRadius: BorderRadius.circular(8),
),
),
),
),
searchMatchFn: (item, searchValue) {
return item.value?.name
?.toLowerCase()
.contains(
return item.value?.name?.toLowerCase().contains(
searchValue.toLowerCase(),
) ??
false;
......@@ -285,8 +277,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
),
onMenuStateChange: (isOpen) {
if (!isOpen) {
provider.paymentAccountSearchController
.clear();
provider.paymentAccountSearchController.clear();
}
},
buttonStyleData: ddtheme.buttonStyleData,
......@@ -400,8 +391,7 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
style: const TextStyle(
fontSize: 14,
),
overflow:
TextOverflow.ellipsis,
overflow: TextOverflow.ellipsis,
),
),
)
......@@ -409,16 +399,12 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
value: provider.selectreceiptPaymentModes,
onChanged: (PaymentModes? value) {
if (value != null) {
if (provider
.receiptPaymentModes
.isNotEmpty) {
provider.selectreceiptPaymentModes =
value;
if (provider.receiptPaymentModes.isNotEmpty) {
provider.selectreceiptPaymentModes = value;
print(
"Selected Complaint Type: ${value.name}, ID: ${value.id}",
);
provider.receiptPaymentModesID =
value.id!;
provider.receiptPaymentModesID = value.id!;
provider.receiptPaymentModesValues =
value.name!;
print(
......@@ -665,15 +651,9 @@ class _AddpaymentreceiptlistState extends State<Addpaymentreceiptlist> {
),
),
),
),
),
onWillPop: () {
provider.resetForm();
return onBackPressed(context);
},
);
},
):NoNetwork(context);
);
}
// void _showDialog(Widget child) {
......
lib/screens/finance/directPaymentRequesitionList.dart
View file @ c92f4c79
......@@ -76,13 +76,24 @@ class _DirectpaymentrequesitionlistState
default:
connection = 'Offline';
}
return connection=="Online"?Consumer<Requestionlistprovider>(
builder: (context, provider, child) {
return WillPopScope(
return (connection == "Online")
? Platform.isAndroid
? WillPopScope(
onWillPop: () => onBackPressed(context),
child: SafeArea(
top: false,
bottom: Platform.isIOS ? false : true,
child: Scaffold(
bottom: true,
child: _scaffold(context),
),
)
: _scaffold(context)
: NoNetwork(context);
}
Widget _scaffold(BuildContext context) {
return Consumer<Requestionlistprovider>(
builder: (context, provider, child) {
return Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: AppColors.white,
appBar: appbar(context, "${widget.pageTitleName}"),
......@@ -119,8 +130,7 @@ class _DirectpaymentrequesitionlistState
style: const TextStyle(
fontSize: 14,
),
overflow:
TextOverflow.ellipsis,
overflow: TextOverflow.ellipsis,
),
),
)
......@@ -149,28 +159,22 @@ class _DirectpaymentrequesitionlistState
searchInnerWidget: Padding(
padding: const EdgeInsets.all(8),
child: TextFormField(
controller:
provider.accountSearchController,
controller: provider.accountSearchController,
decoration: InputDecoration(
isDense: true,
contentPadding:
const EdgeInsets.symmetric(
contentPadding: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 8,
),
hintText: 'Search account...',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(
8,
),
borderRadius: BorderRadius.circular(8),
),
),
),
),
searchMatchFn: (item, searchValue) {
return item.value?.name
?.toLowerCase()
.contains(
return item.value?.name?.toLowerCase().contains(
searchValue.toLowerCase(),
) ??
false;
......@@ -215,9 +219,7 @@ class _DirectpaymentrequesitionlistState
value: accs,
child: Text(
accs.name ?? '',
style: const TextStyle(
fontSize: 14,
),
style: const TextStyle(fontSize: 14),
overflow: TextOverflow.ellipsis,
),
),
......@@ -226,16 +228,12 @@ class _DirectpaymentrequesitionlistState
value: provider.selectDirectPaymentAccounts,
onChanged: (DirectPaymentAccounts? value) {
if (value != null) {
if (provider
.directPaymentAccounts
.isNotEmpty) {
provider.selectDirectPaymentAccounts =
value;
if (provider.directPaymentAccounts.isNotEmpty) {
provider.selectDirectPaymentAccounts = value;
print(
"Selected Complaint Type: ${value.name}, ID: ${value.id}",
);
provider.directPaymentAccountsID =
value.id!;
provider.directPaymentAccountsID = value.id!;
provider.directPaymentAccountsValue =
value.name!;
print(
......@@ -254,28 +252,22 @@ class _DirectpaymentrequesitionlistState
padding: const EdgeInsets.all(8),
child: TextFormField(
controller:
provider
.paymentAccountSearchController,
provider.paymentAccountSearchController,
decoration: InputDecoration(
isDense: true,
contentPadding:
const EdgeInsets.symmetric(
contentPadding: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 8,
),
hintText: 'Search account...',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(
8,
),
borderRadius: BorderRadius.circular(8),
),
),
),
),
searchMatchFn: (item, searchValue) {
return item.value?.name
?.toLowerCase()
.contains(
return item.value?.name?.toLowerCase().contains(
searchValue.toLowerCase(),
) ??
false;
......@@ -285,8 +277,7 @@ class _DirectpaymentrequesitionlistState
),
onMenuStateChange: (isOpen) {
if (!isOpen) {
provider.paymentAccountSearchController
.clear();
provider.paymentAccountSearchController.clear();
}
},
buttonStyleData: ddtheme.buttonStyleData,
......@@ -393,9 +384,8 @@ class _DirectpaymentrequesitionlistState
items:
provider.directPaymentModes
.map(
(paymenents) => DropdownMenuItem<
DirectPaymentModes
>(
(paymenents) =>
DropdownMenuItem<DirectPaymentModes>(
value: paymenents,
child: Text(
paymenents.name ?? '',
......@@ -410,9 +400,7 @@ class _DirectpaymentrequesitionlistState
value: provider.selectDirectPaymentModes,
onChanged: (DirectPaymentModes? value) {
if (value != null) {
if (provider
.directPaymentModes
.isNotEmpty) {
if (provider.directPaymentModes.isNotEmpty) {
provider.selectDirectPaymentModes = value;
print(
"Selected Complaint Type: ${value.name}, ID: ${value.id}",
......@@ -514,8 +502,7 @@ class _DirectpaymentrequesitionlistState
TextInputAction.next,
),
errorWidget(context, provider.bankHolderError),
] else if (provider.directPaymentModesValues ==
"UPI") ...[
] else if (provider.directPaymentModesValues == "UPI") ...[
textControllerWidget(
context,
provider.bankUpiController,
......@@ -652,9 +639,7 @@ class _DirectpaymentrequesitionlistState
child:
provider.submitClicked
? CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation(
AppColors.app_blue,
),
valueColor: AlwaysStoppedAnimation(AppColors.app_blue),
)
: Text(
"Submit",
......@@ -666,15 +651,9 @@ class _DirectpaymentrequesitionlistState
),
),
),
),
),
onWillPop: () {
provider.resetForm();
return onBackPressed(context);
},
);
},
):NoNetwork(context);
);
}
// void _showDialog(Widget child) {
......
lib/screens/finance/financeDashboard.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/finance/paymentreceiptList.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/order/orderModuleDashboard.dart
View file @ c92f4c79
This diff is collapsed.
lib/screens/order/ordersListByModes.dart
View file @ c92f4c79
This diff is collapsed.
pubspec.lock
View file @ c92f4c79
This diff is collapsed.
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