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