Skip to content

GitLab

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

08-08-2025 By Sai Srinivas 

Order Module
parent b5225d58
Expand all Hide whitespace changes
Inline Side-by-side
lib/screens/order/paymentListsByMode.dart
View file @ ad026e51
...@@ -159,9 +159,10 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> { ...@@ -159,9 +159,10 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
return (connection == "Online") return (connection == "Online")
? Platform.isAndroid ? Platform.isAndroid
? WillPopScope( ? WillPopScope(
onWillPop: () { onWillPop: () async {
Provider.of<Paymentsprovider>(context).resetAll(); Provider.of<Paymentsprovider>(context,listen: false).resetAll();
return onBackPressed(context); Navigator.pop(context,true);
return true;
}, },
child: SafeArea( child: SafeArea(
top: false, top: false,
...@@ -175,221 +176,200 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> { ...@@ -175,221 +176,200 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
Widget _scaffold(BuildContext context) { Widget _scaffold(BuildContext context) {
switch (_source.keys.toList()[0]) {
case ConnectivityResult.mobile: return Consumer<Paymentsprovider>(
connection = 'Online';
break;
case ConnectivityResult.wifi:
connection = 'Online';
break;
case ConnectivityResult.none:
default:
connection = 'Offline';
}
return
Consumer<Paymentsprovider>(
builder: (context, provider, child) { builder: (context, provider, child) {
final paymentLists = provider.paymentsList; final paymentLists = provider.paymentsList;
return WillPopScope( return Scaffold(
onWillPop: () { resizeToAvoidBottomInset: true,
provider.resetAll(); appBar: appbar2New(
return onBackPressed(context); context,
}, widget.pageTitleName,
child: SafeArea( provider.resetAll,
top: false, Row(
bottom: Platform.isIOS?false:true, children: [
child: Scaffold( // InkResponse(
resizeToAvoidBottomInset: true, // onTap: () {
appBar: appbar2New( // _showOptionsSheet(context);
context, // },
widget.pageTitleName, // child: SvgPicture.asset("assets/svg/ic_download.svg",),
provider.resetAll, // ),
Row(
children: [
// InkResponse(
// onTap: () {
// _showOptionsSheet(context);
// },
// child: SvgPicture.asset("assets/svg/ic_download.svg",),
// ),
InkResponse( InkResponse(
onTap: () async {
_showFilterSheet(context);
},
child: SvgPicture.asset(
"assets/svg/filter_ic.svg", height: 25,),
),
],
),
0xFFFFFFFF
),
backgroundColor: AppColors.scaffold_bg_color,
body:
provider.isLoading
? Center(child: CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>(
AppColors.app_blue)
))
: paymentLists.isNotEmpty ? SingleChildScrollView(
child: Column(
children: [
ListView.builder(
itemCount: paymentLists.length,
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
if (paymentLists.isEmpty) {
return SizedBox(
child: Center(
child: Text("No Data Available"),
),
);
}
return InkResponse(
onTap: () async { onTap: () async {
_showFilterSheet(context); Navigator.push(context, MaterialPageRoute(
builder: (context) =>
Paymentdetailsbymode(mode: widget.mode,
pageTitleName: widget.pageTitleName,
paymentId: paymentLists[index].paymentId,
),));
}, },
child: SvgPicture.asset( child: Container(
"assets/svg/filter_ic.svg", height: 25,), padding: EdgeInsets.symmetric(
), horizontal: 7.5,
], vertical: 5,
), ),
0xFFFFFFFF margin: EdgeInsets.symmetric(
), horizontal: 10,
backgroundColor: AppColors.scaffold_bg_color, vertical: 5,
body: ),
provider.isLoading decoration: BoxDecoration(
? Center(child: CircularProgressIndicator.adaptive( color: Colors.white,
valueColor: AlwaysStoppedAnimation<Color>( borderRadius: BorderRadius.circular(16),
AppColors.app_blue) ),
)) child: Column(
: paymentLists.isNotEmpty ? SingleChildScrollView(
child: Column(
children: [
ListView.builder(
itemCount: paymentLists.length,
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
if (paymentLists.isEmpty) {
return SizedBox(
child: Center(
child: Text("No Data Available"),
),
);
}
return InkResponse(
onTap: () async {
Navigator.push(context, MaterialPageRoute(
builder: (context) =>
Paymentdetailsbymode(mode: widget.mode,
pageTitleName: widget.pageTitleName,
paymentId: paymentLists[index].paymentId,
),));
},
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 7.5,
vertical: 5,
),
margin: EdgeInsets.symmetric(
horizontal: 10,
vertical: 5,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(16),
),
child: Column(
children: [
Row(
children: [ children: [
Row( // Expanded(
children: [ // flex: 1,
// Expanded( // child: Container(
// flex: 1, // height: 50,
// child: Container( // width: 35,
// height: 50, // padding: EdgeInsets.all(8.0),
// width: 35, // decoration: BoxDecoration(
// padding: EdgeInsets.all(8.0), // color: Color(0xFFFFF3CE),
// decoration: BoxDecoration( // borderRadius:
// color: Color(0xFFFFF3CE), // BorderRadius.circular(8),
// borderRadius: // ),
// BorderRadius.circular(8), // child: SvgPicture.asset(
// ), // "assets/svg/fin_ic.svg",
// child: SvgPicture.asset( // ),
// "assets/svg/fin_ic.svg", // ),
// ), // ),
// ), Expanded(
// ), flex: 1,
Expanded( child: Container(
flex: 1, height: 50,
child: Container( width: 50,
height: 50, padding: EdgeInsets.all(8.0),
width: 50, decoration: BoxDecoration(
padding: EdgeInsets.all(8.0), color: getDecorationColor(
decoration: BoxDecoration( paymentLists[index].status,
color: getDecorationColor( ),
shape: BoxShape.circle,
),
child: Center(
child: Text(
getText(
paymentLists[index].status,
),
style: TextStyle(
color: getTextColor(
paymentLists[index].status, paymentLists[index].status,
), ),
shape: BoxShape.circle, fontSize: getSize(
), paymentLists[index].status,
child: Center(
child: Text(
getText(
paymentLists[index].status,
),
style: TextStyle(
color: getTextColor(
paymentLists[index].status,
),
fontSize: getSize(
paymentLists[index].status,
),
fontFamily: "JakartaBold",
),
), ),
fontFamily: "JakartaBold",
), ),
), ),
), ),
SizedBox(width: 10), ),
SizedBox(width: 10), ),
Expanded( SizedBox(width: 10),
flex: 4, SizedBox(width: 10),
child: SizedBox( Expanded(
child: Column( flex: 4,
crossAxisAlignment: child: SizedBox(
CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment:
Text( CrossAxisAlignment.start,
paymentLists[index].ename!, children: [
style: TextStyle( Text(
fontFamily: paymentLists[index].ename!,
"JakartaMedium", style: TextStyle(
fontSize: 14, fontFamily:
color: "JakartaMedium",
AppColors.semi_black, fontSize: 14,
), color:
), AppColors.semi_black,
Text( ),
paymentLists[index]
.orderNumber??"-",
style: TextStyle(
fontSize: 14,
color: AppColors.grey_semi,
fontFamily:
"JakartaRegular",
decoration:
TextDecoration.none,
decorationColor:
AppColors.white,
),
),
],
), ),
), Text(
paymentLists[index]
.orderNumber??"-",
style: TextStyle(
fontSize: 14,
color: AppColors.grey_semi,
fontFamily:
"JakartaRegular",
decoration:
TextDecoration.none,
decorationColor:
AppColors.white,
),
),
],
), ),
Expanded( ),
flex: 2, ),
child: Container( Expanded(
flex: 2,
child: Container(
child: Center( child: Center(
child: Text( child: Text(
"₹" "₹"
"${paymentLists[index].amount}", "${paymentLists[index].amount}",
textAlign: TextAlign.right, textAlign: TextAlign.right,
style: TextStyle( style: TextStyle(
fontFamily: fontFamily:
"JakartaMedium", "JakartaMedium",
fontSize: 14, fontSize: 14,
color: AppColors.app_blue, color: AppColors.app_blue,
),
),
), ),
), ),
), ),
], ),
), ),
], ],
), ),
),
); ],
}, ),
), ),
], );
},
), ),
) : Emptywidget(context), ],
), ),
), ) : Emptywidget(context),
); );
}, },
); );
......
lib/services/api_calling.dart
View file @ ad026e51
...@@ -15,6 +15,7 @@ import 'package:generp/Models/crmModels/LeadListContactPopUpResponse.dart'; ...@@ -15,6 +15,7 @@ import 'package:generp/Models/crmModels/LeadListContactPopUpResponse.dart';
import 'package:generp/Models/crmModels/LeadListViewResponse.dart'; import 'package:generp/Models/crmModels/LeadListViewResponse.dart';
import 'package:generp/Models/crmModels/ProspectListViewResponse.dart'; import 'package:generp/Models/crmModels/ProspectListViewResponse.dart';
import 'package:generp/Models/crmModels/SubmitLeadListFilterResponse.dart'; import 'package:generp/Models/crmModels/SubmitLeadListFilterResponse.dart';
import 'package:generp/Models/crmModels/crmDashboardQuotationResponse.dart';
import 'package:generp/Models/crmModels/crmDownloadGenQuoteResponse.dart'; import 'package:generp/Models/crmModels/crmDownloadGenQuoteResponse.dart';
import 'package:generp/Models/crmModels/crmLeadDetailsGenerateQuotationSubmitResponse.dart'; import 'package:generp/Models/crmModels/crmLeadDetailsGenerateQuotationSubmitResponse.dart';
import 'package:generp/Models/crmModels/crmNewLeadsProspectsSubmitResponse.dart'; import 'package:generp/Models/crmModels/crmNewLeadsProspectsSubmitResponse.dart';
...@@ -66,6 +67,7 @@ import '../Models/ViewVisitDetailsResponse.dart'; ...@@ -66,6 +67,7 @@ import '../Models/ViewVisitDetailsResponse.dart';
import '../Models/commonModels/commonAddAccountsSubmitResponse.dart'; import '../Models/commonModels/commonAddAccountsSubmitResponse.dart';
import '../Models/crmModels/appointmentCalendarResponse.dart'; import '../Models/crmModels/appointmentCalendarResponse.dart';
import '../Models/crmModels/crmAddFollowUpResponse.dart'; import '../Models/crmModels/crmAddFollowUpResponse.dart';
import '../Models/crmModels/crmDashboardFollowUpResponse.dart';
import '../Models/crmModels/crmDashboardResponse.dart'; import '../Models/crmModels/crmDashboardResponse.dart';
import '../Models/crmModels/crmPendingTasksResponse.dart'; import '../Models/crmModels/crmPendingTasksResponse.dart';
import '../Models/crmModels/crmSelectedProductDetailsResponse.dart'; import '../Models/crmModels/crmSelectedProductDetailsResponse.dart';
...@@ -3162,6 +3164,71 @@ class ApiCalling { ...@@ -3162,6 +3164,71 @@ class ApiCalling {
} }
} }
static Future<CommonResponse?> paymentsDetailsAddAdjustedOrderAPI(
empId,
session,
payment_id,
selected_order_id,
amount,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'payment_id': (payment_id).toString(),
'selected_order_id': (selected_order_id).toString(),
'amount': (amount).toString(),
};
final res = await post(data, ordersPaymentDetailsAddOrderUrl, {});
if (res != null) {
print("paymentsDetailsAddAdjusted: $data");
debugPrint(res.body);
return CommonResponse.fromJson(
jsonDecode(res.body),
);
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<CommonResponse?> paymentsDetailsEditAdjustedOrderAPI(
empId,
session,
selected_order_id,
amount,
order_payment_id,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'selected_order_id': (selected_order_id).toString(),
'amount': (amount).toString(),
'order_payment_id': (order_payment_id).toString(),
};
final res = await post(data, ordersPaymentDetailsEditOrderUrl, {});
if (res != null) {
print("paymentsDetailsEditAdjusted $data");
debugPrint(res.body);
return CommonResponse.fromJson(
jsonDecode(res.body),
);
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<CommonResponse?> ordersAddTPCAgentAPI( static Future<CommonResponse?> ordersAddTPCAgentAPI(
empId, empId,
session, session,
...@@ -4726,6 +4793,56 @@ class ApiCalling { ...@@ -4726,6 +4793,56 @@ class ApiCalling {
} }
} }
static Future<crmDashboardFollowUpResponse?> crmDashboardFollowUpAPI(
empId,
session,
type,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'type': (type).toString(),
};
final res = await post(data, crmDashboardFollowUpUrl, {});
if (res != null) {
print(data);
debugPrint(res.body);
return crmDashboardFollowUpResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<crmDashboardQuotationResponse?> crmDashboardQuotationsAPI(
empId,
session,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
};
final res = await post(data, crmDashboardQuotationsUrl, {});
if (res != null) {
print(data);
debugPrint(res.body);
return crmDashboardQuotationResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
// static Future<CommonResponse?> TpcIssueListApprovalAPI( // static Future<CommonResponse?> TpcIssueListApprovalAPI(
// empId, // empId,
// session, // session,
......
lib/services/api_names.dart
View file @ ad026e51
...@@ -118,6 +118,8 @@ const ordersPaymentListByModeUrl = "${baseUrl_test}crm_payments_list_filter_subm ...@@ -118,6 +118,8 @@ const ordersPaymentListByModeUrl = "${baseUrl_test}crm_payments_list_filter_subm
const ordersPaymentListDeleteUrl = "${baseUrl_test}delete_crm_order_payment"; const ordersPaymentListDeleteUrl = "${baseUrl_test}delete_crm_order_payment";
const ordersPaymentListApproveRejectUrl = "${baseUrl_test}crm_approve_reject_payment"; const ordersPaymentListApproveRejectUrl = "${baseUrl_test}crm_approve_reject_payment";
const ordersPaymentDetailsUrl = "${baseUrl_test}crm_payment_details"; const ordersPaymentDetailsUrl = "${baseUrl_test}crm_payment_details";
const ordersPaymentDetailsAddOrderUrl = "${baseUrl_test}crm_payment_add_adjusted_orders";
const ordersPaymentDetailsEditOrderUrl = "${baseUrl_test}crm_payment_edit_adjusted_orders";
const ordersAddTPCAgentUrl = "${baseUrl_test}add_tpc_agent_submit"; const ordersAddTPCAgentUrl = "${baseUrl_test}add_tpc_agent_submit";
const ordersTPCAgentListUrl = "${baseUrl_test}tpc_agent_list"; const ordersTPCAgentListUrl = "${baseUrl_test}tpc_agent_list";
const ordersTPCAgentDetailsUrl = "${baseUrl_test}tpc_agent_details"; const ordersTPCAgentDetailsUrl = "${baseUrl_test}tpc_agent_details";
...@@ -170,6 +172,8 @@ const crmNewProspectLeadViewUrl = "${baseUrl_test}crm_add_new_lead_prospect_view ...@@ -170,6 +172,8 @@ const crmNewProspectLeadViewUrl = "${baseUrl_test}crm_add_new_lead_prospect_view
const crmNewProspectLeadSubmitUrl = "${baseUrl_test}crm_add_new_lead_prospect_submit"; const crmNewProspectLeadSubmitUrl = "${baseUrl_test}crm_add_new_lead_prospect_submit";
const crmNewProspectListEditGstUrl = "${baseUrl_test}crm_prospect_list_edit_gst"; const crmNewProspectListEditGstUrl = "${baseUrl_test}crm_prospect_list_edit_gst";
const crmNearbyOpenLeadsUrl = "${baseUrl_test}nearby_crm_open_leads"; const crmNearbyOpenLeadsUrl = "${baseUrl_test}nearby_crm_open_leads";
const crmDashboardFollowUpUrl = "${baseUrl_test}crm_dashboard_followup_list";
const crmDashboardQuotationsUrl = "${baseUrl_test}crm_dashboard_quotations_list";
......
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