Skip to content

GitLab

"lib/screens/git@183.82.99.133:saisrinivas/gen_erp_2025.git" did not exist on "6d1deaf28ada26a26a21e95f6d09b9a4c156f74e"
Commit 2ccf19cc authored by Sai Srinivas's avatar Sai Srinivas
Browse files

04-07-2025 By Sai Srinivas 

Test cases and Order Module, Crm Module.
parent 4b790bef
Hide whitespace changes
Inline Side-by-side
lib/screens/order/addTpcAgent.dart
View file @ 2ccf19cc
...@@ -66,6 +66,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> { ...@@ -66,6 +66,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
textControllerWidget( textControllerWidget(
context, context,
provider.tpcNameController, provider.tpcNameController,
"Name",
"Enter Name", "Enter Name",
provider.onChangetpcName, provider.onChangetpcName,
TextInputType.text, TextInputType.text,
...@@ -82,6 +83,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> { ...@@ -82,6 +83,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
textControllerWidget( textControllerWidget(
context, context,
provider.tpcMobileNumberController, provider.tpcMobileNumberController,
"Mobile Number",
"Enter Mobile Number", "Enter Mobile Number",
provider.onChangetpcMobileNumber, provider.onChangetpcMobileNumber,
TextInputType.number, TextInputType.number,
...@@ -160,6 +162,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> { ...@@ -160,6 +162,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
textControllerWidget( textControllerWidget(
context, context,
provider.tpcBankNameController, provider.tpcBankNameController,
"Bank Name",
"Enter Bank Name", "Enter Bank Name",
provider.onChangetpcBankName, provider.onChangetpcBankName,
TextInputType.text, TextInputType.text,
...@@ -174,6 +177,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> { ...@@ -174,6 +177,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
textControllerWidget( textControllerWidget(
context, context,
provider.tpcBankBeneficiaryNameController, provider.tpcBankBeneficiaryNameController,
"Bank Beneficiary Name",
"Enter Bank Beneficiary Name", "Enter Bank Beneficiary Name",
provider.onChangetpcBankBeneficiaryName, provider.onChangetpcBankBeneficiaryName,
TextInputType.text, TextInputType.text,
...@@ -191,6 +195,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> { ...@@ -191,6 +195,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
textControllerWidget( textControllerWidget(
context, context,
provider.tpcBankAccountNumberController, provider.tpcBankAccountNumberController,
"Bank Account Number",
"Enter Bank Account Number", "Enter Bank Account Number",
provider.onChangetpcBankAccountNumber, provider.onChangetpcBankAccountNumber,
TextInputType.number, TextInputType.number,
...@@ -208,6 +213,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> { ...@@ -208,6 +213,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
textControllerWidget( textControllerWidget(
context, context,
provider.tpcBankIFSCController, provider.tpcBankIFSCController,
"Bank IFSC",
"Enter Bank IFSC", "Enter Bank IFSC",
provider.onChangetpcBankIFSC, provider.onChangetpcBankIFSC,
TextInputType.text, TextInputType.text,
...@@ -223,6 +229,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> { ...@@ -223,6 +229,7 @@ class _AddtpcagentScreenState extends State<AddtpcagentScreen> {
textControllerWidget( textControllerWidget(
context, context,
provider.tpcNoteController, provider.tpcNoteController,
"Description",
"Enter Description", "Enter Description",
provider.onChangetpcNote, provider.onChangetpcNote,
TextInputType.text, TextInputType.text,
......
lib/screens/order/editAdjustedOrderList.dart
View file @ 2ccf19cc
...@@ -298,6 +298,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> { ...@@ -298,6 +298,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
context, context,
editProvider editProvider
.editOrderAmountControllers[index], .editOrderAmountControllers[index],
"Order Amount",
"Enter Order Amount", "Enter Order Amount",
(p0) {}, (p0) {},
TextInputType.number, TextInputType.number,
...@@ -486,6 +487,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> { ...@@ -486,6 +487,7 @@ class _EditadjustedorderlistState extends State<Editadjustedorderlist> {
context, context,
editProvider editProvider
.editOrderAmountControllers2[j], .editOrderAmountControllers2[j],
"Order Amount",
"Enter Order Amount", "Enter Order Amount",
(p0) {}, (p0) {},
TextInputType.number, TextInputType.number,
......
lib/screens/order/editOrderAccountDetails.dart
View file @ 2ccf19cc
...@@ -34,6 +34,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> { ...@@ -34,6 +34,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
super.initState(); super.initState();
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var provider = Provider.of<Editorderprovider>(context, listen: false); var provider = Provider.of<Editorderprovider>(context, listen: false);
provider.ordersEditOrderAPIViewFunction(context, widget.orderID); provider.ordersEditOrderAPIViewFunction(context, widget.orderID);
}); });
} }
...@@ -109,7 +110,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> { ...@@ -109,7 +110,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
value!.name!; value!.name!;
if (provider.dispatchDistricts.isNotEmpty) { if (provider.dispatchDistricts.isNotEmpty) {
provider.dispatchDistricts.clear(); provider.dispatchDistricts.clear();
provider.selectedDispatchDistricts = null; // provider.selectedDispatchDistricts = null;
provider.selectedDispatchDistrictId = null; provider.selectedDispatchDistrictId = null;
provider.selectedDispatchDistrictValue = ""; provider.selectedDispatchDistrictValue = "";
} }
...@@ -167,8 +168,8 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> { ...@@ -167,8 +168,8 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
.dispatchSubLocations .dispatchSubLocations
.isNotEmpty) { .isNotEmpty) {
provider.dispatchSubLocations.clear(); provider.dispatchSubLocations.clear();
provider.selectedDispatchSubLocations = // provider.selectedDispatchSubLocations =
null; // null;
provider.selectedDispatchSubLocID = null; provider.selectedDispatchSubLocID = null;
provider.selectedDispatchSubLocValue = ""; provider.selectedDispatchSubLocValue = "";
} }
...@@ -235,6 +236,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> { ...@@ -235,6 +236,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
context, context,
provider.dispatchAddressController, provider.dispatchAddressController,
"Dispatch Address", "Dispatch Address",
"Enter Dispatch Address",
provider.onChangedDispatchAddress, provider.onChangedDispatchAddress,
TextInputType.text, TextInputType.text,
false, false,
...@@ -247,6 +249,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> { ...@@ -247,6 +249,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
context, context,
provider.dispatchPincodeController, provider.dispatchPincodeController,
"Dispatch Pin code", "Dispatch Pin code",
"Enter Dispatch Pin code",
provider.onChangedDispatchPincode, provider.onChangedDispatchPincode,
TextInputType.number, TextInputType.number,
false, false,
...@@ -257,6 +260,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> { ...@@ -257,6 +260,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
textControllerWidget( textControllerWidget(
context, context,
provider.noteController, provider.noteController,
"Note",
"Enter Note", "Enter Note",
provider.onChangedNote, provider.onChangedNote,
TextInputType.text, TextInputType.text,
...@@ -392,7 +396,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> { ...@@ -392,7 +396,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
), ),
) )
.toList(), .toList(),
value: provider.selectedFreightScope, value:provider.selectedFreightScope,
onChanged: (String? value) { onChanged: (String? value) {
if (provider.freightScope.isNotEmpty) { if (provider.freightScope.isNotEmpty) {
provider.selectedFreightScope = value; provider.selectedFreightScope = value;
...@@ -469,7 +473,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> { ...@@ -469,7 +473,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
), ),
) )
.toList(), .toList(),
value: provider.selectedErectionScope, value:provider.selectedErectionScope,
onChanged: (String? value) { onChanged: (String? value) {
if (provider.erectionScope.isNotEmpty) { if (provider.erectionScope.isNotEmpty) {
provider.selectedErectionScope = value; provider.selectedErectionScope = value;
...@@ -513,7 +517,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> { ...@@ -513,7 +517,7 @@ class _EditorderaccountdetailsState extends State<Editorderaccountdetails> {
provider.submitClicked provider.submitClicked
? CircularProgressIndicator.adaptive( ? CircularProgressIndicator.adaptive(
valueColor: AlwaysStoppedAnimation<Color>( valueColor: AlwaysStoppedAnimation<Color>(
AppColors.app_blue, AppColors.white,
), ),
) )
: Text( : Text(
......
lib/screens/order/editPaymentDetailsByMode.dart
View file @ 2ccf19cc
...@@ -160,6 +160,7 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> { ...@@ -160,6 +160,7 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> {
context, context,
provider.amountController, provider.amountController,
"Amount", "Amount",
"Enter Amount",
provider.onChangeAmount, provider.onChangeAmount,
TextInputType.number, TextInputType.number,
false, false,
...@@ -226,7 +227,8 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> { ...@@ -226,7 +227,8 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> {
textControllerWidget( textControllerWidget(
context, context,
provider.paymentRefController, provider.paymentRefController,
"Payment Reference No. / Cheque No. / UTR No. tf", "Payment Reference No.",
"Enter Payment Reference No. / Cheque No. / UTR No.",
provider.onChangepaymentRef, provider.onChangepaymentRef,
TextInputType.text, TextInputType.text,
false, false,
...@@ -293,7 +295,7 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> { ...@@ -293,7 +295,7 @@ class _EditpaymentdetailsbymodeState extends State<Editpaymentdetailsbymode> {
), ),
floatingActionButtonLocation: floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
bottomNavigationBar: InkResponse( floatingActionButton: InkResponse(
onTap: onTap:
editProvider.submitLoading editProvider.submitLoading
? null ? null
......
lib/screens/order/orderModuleDashboard.dart
View file @ 2ccf19cc
...@@ -22,6 +22,7 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -22,6 +22,7 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
super.initState(); super.initState();
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
var provider = Provider.of<Pagesdashboardprovider>(context, listen: false); var provider = Provider.of<Pagesdashboardprovider>(context, listen: false);
provider.orderDashboardAPIFunction(context, "executive", "", "", "");
provider.ordersAccessiblePagesAPIFunction(context); provider.ordersAccessiblePagesAPIFunction(context);
}); });
} }
...@@ -40,6 +41,101 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> { ...@@ -40,6 +41,101 @@ class _OrdermoduledashboardState extends State<Ordermoduledashboard> {
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
children: [ children: [
Container(
padding: EdgeInsets.symmetric(horizontal: 10,vertical: 5),
margin: EdgeInsets.symmetric(horizontal: 0,vertical: 10),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(16)
),
height: MediaQuery.of(context).size.height * 0.28,
child: GridView.builder(
padding: EdgeInsets.symmetric(horizontal: 0,vertical: 5),
itemCount: provider.ordersgain.length,
shrinkWrap: true,
scrollDirection: Axis.horizontal,
physics: AlwaysScrollableScrollPhysics(),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
crossAxisSpacing: 10,
mainAxisSpacing: 10,
childAspectRatio: 0.65
),
itemBuilder: (context, jndex) {
final icons = ["comm_ic_1", "comm_ic_2"];
final leadTitles = [
'Order Gain',
'Dispatched',
'Pending Tasks',
'Quote',
];
final colors = [
0xFFE7FFE5,
0xFFF3EDFF,
0xFFFFFCD5,
0xFFFFF6F0,
];
final textcolors = [
0xFF0D9C00,
0xFF493272,
0xFF605C00,
0xFF91481B,
];
return InkResponse(
onTap: () async {
if (provider.ordersgain[jndex].filter!.pageName !=
"") {
if (provider.ordersgain[jndex].filter!.pageName!
.contains("Order List")) {
// await Navigator.push(
// context,
// MaterialPageRoute(
// builder:
// (context) => OrderslistbyModes(
// pageTitleName:
// provider
// .ordersgain[jndex]
// .filter!
// .pageName!,
// mode:
// provider.ordersgain[jndex].filter!.mode,
// filter: provider.ordersgain[jndex].filter!,
// ),
// ),
// );
}
}
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 13),
decoration: BoxDecoration(
color: Color(colors[jndex]),
borderRadius: BorderRadius.circular(12),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
provider.ordersgain[jndex].count!,
style: TextStyle(
fontSize: 30,
fontFamily: "JakartaMedium",
color: Color(textcolors[jndex]),
),
),
Text(
leadTitles[jndex],
style: TextStyle(color: Color(0xFF818181)),
),
],
),
),
);
},
),
),
ListView.builder( ListView.builder(
itemCount: pages.length, itemCount: pages.length,
shrinkWrap: true, shrinkWrap: true,
......
lib/screens/order/ordersDetailsByModes.dart
View file @ 2ccf19cc
...@@ -41,8 +41,8 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -41,8 +41,8 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
context, context,
listen: false, listen: false,
); );
provider.showMoreDetails = false;
var disproved = Provider.of<Dispatchorderprovider>(context,listen: false); var disproved = Provider.of<Dispatchorderprovider>(context,listen: false);
disproved.ordersDetailsDispatchOrderViewFunction(context,widget.orderId);
provider.ordersDetailsByModeAPIFunction( provider.ordersDetailsByModeAPIFunction(
context, context,
widget.orderId, widget.orderId,
...@@ -57,12 +57,139 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -57,12 +57,139 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
builder: (context, provider,disProvider, child) { builder: (context, provider,disProvider, child) {
var orderDetails = provider.orderDetails; var orderDetails = provider.orderDetails;
var Headings1 = [
"Order Number",
"Account Name",
"Sales Person Name",
"Order Received Date",
];
var subHeadings1 = [
provider.orderDetails.orderNumber ?? "-",
provider.orderDetails.accountName ?? "-",
provider.orderDetails.salesPersonEmpName ?? "-",
provider.orderDetails.orderReceivedDate ?? "-",
];
var Headings2 = [
"Billing State",
"Billing District",
"Billing Sub Location",
"Billing Pincode",
"Billing Address",
"Entered By",
"Dispatch State",
"Dispatch District",
"District Sub Location",
"Dispatch Pincode",
"Dispatch Address",
"GST Number",
"Unloading Scope",
"Freight Scope",
"Erection Scope",
"CGST Amount",
"SGST Amount",
"IGST Amount",
"OTP",
"Basic Amount",
"Paid Amount",
"Balance Amount",
"Total Amount",
"TPC Applicable",
"TPC Agent",
"TPC Requested Amount",
"TPC Level 1 Approved Amount",
"TPC Level 2 Approved Amount",
"TPC Payment Mode",
"TPC Payment Reference No",
"TPC Payment Attachment",
"TPC Status",
"Purchase Order",
"Created Datetime",
"Note",
"Status",
];
var subHeadings2 = [
provider.orderDetails.billingState ?? "-",
provider.orderDetails.billingDistrict ?? "-",
provider.orderDetails.billingSubLocality ?? "-",
provider.orderDetails.billingPincode ?? "-",
provider.orderDetails.billingAddress ?? "-",
provider.orderDetails.enteredEmpName ?? "-",
provider.orderDetails.stateName ?? "-",
provider.orderDetails.districtName ?? "-",
provider.orderDetails.subLocationName ?? "-",
provider.orderDetails.dispatchPincode ?? "-",
provider.orderDetails.dispatchAddress ?? "-",
provider.orderDetails.gstNumber ?? "-",
provider.orderDetails.unloadingScope ?? "-",
provider.orderDetails.freightScope ?? "-",
provider.orderDetails.erectionScope ?? "-",
provider.orderDetails.cgstAmount ?? "-",
provider.orderDetails.sgstAmount ?? "-",
provider.orderDetails.igstAmount ?? "-",
provider.orderDetails.otp ?? "-",
provider.orderDetails.basicAmount ?? "-",
provider.orderDetails.paidAmount ?? "-",
provider.orderDetails.balanceAmount ?? "-",
provider.orderDetails.totalAmount ?? "-",
provider.orderDetails.tpcApplicable ?? "-",
provider.orderDetails.tpcaAgentName ?? "-",
provider.orderDetails.requestedTpcAmount ?? "-",
provider.orderDetails.level1TpcApprovedAmount ?? "-",
provider.orderDetails.level2TpcApprovedAmount ?? "-",
provider.orderDetails.tpcPaymentMode ?? "-",
provider.orderDetails.tpcPaymentReferenceNo ?? "-",
provider.orderDetails.tpcPaymentAttachementViewFileName ?? "-",
provider.orderDetails.tpcStatus ?? "-",
provider.orderDetails.tpcPaymentAttachmentDirFilePath ?? "-",
provider.orderDetails.createdDatetime ?? "-",
provider.orderDetails.note ?? "-",
provider.orderDetails.status ?? "-",
];
var Headings = [...Headings1];
var subHeadings = [...subHeadings1];
if(provider.showMoreDetails){
Headings = [...Headings1,...Headings2];
subHeadings = [...subHeadings1,...subHeadings2];
}
return WillPopScope( return WillPopScope(
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
appBar: appbar2( appBar: appbar2(
context, context,
widget.pageTitleName, widget.mode!=""?"Order Details": "Order Details (${widget.mode})",
provider.resetAll, provider.resetAll,
InkResponse( InkResponse(
onTap: () { onTap: () {
...@@ -152,7 +279,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -152,7 +279,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
], ],
), ),
Divider(thickness: 0.5, color: Color(0xFFD7D7D7)), Divider(thickness: 0.5, color: Color(0xFFD7D7D7)),
...List.generate(provider.subHeadings.length, (j) { ...List.generate(subHeadings.length, (j) {
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 7), padding: EdgeInsets.symmetric(vertical: 7),
child: Row( child: Row(
...@@ -160,7 +287,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -160,7 +287,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
provider.Headings[j], Headings[j],
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
fontSize: 14, fontSize: 14,
...@@ -171,7 +298,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -171,7 +298,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
if (provider.Headings[j] == if (Headings[j] ==
"Purchase Order") { "Purchase Order") {
Navigator.push( Navigator.push(
context, context,
...@@ -190,23 +317,23 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -190,23 +317,23 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
} }
}, },
child: Text( child: Text(
provider.Headings[j] == "Purchase Order" Headings[j] == "Purchase Order"
? "View" ? "View"
: "${provider.subHeadings[j]}", :subHeadings[j]==""?"-":"${subHeadings[j]}",
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: color:
provider.Headings[j] == Headings[j] ==
"Purchase Order" "Purchase Order"
? AppColors.app_blue ? AppColors.app_blue
: Color(0xFF818181), : Color(0xFF818181),
decoration: decoration:
provider.Headings[j] == Headings[j] ==
"Purchase Order" "Purchase Order"
? TextDecoration.underline ? TextDecoration.underline
: TextDecoration.none, : TextDecoration.none,
decorationColor: decorationColor:
provider.Headings[j] == Headings[j] ==
"Purchase Order" "Purchase Order"
? AppColors.app_blue ? AppColors.app_blue
: AppColors.white, : AppColors.white,
...@@ -218,6 +345,33 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -218,6 +345,33 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
), ),
); );
}), }),
InkResponse(
onTap: () async {
provider.showMoreDetails = !provider.showMoreDetails;
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 5,
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Text(
provider.showMoreDetails?"- Show Less": "+ More Details",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.app_blue,
),
),
],
),
),
),
], ],
), ),
), ),
...@@ -341,32 +495,33 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -341,32 +495,33 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
), ),
], ],
if (widget.mode == "dispatched") ...[ if (widget.mode == "dispatched") ...[
// Expanded( Expanded(
// child: InkResponse( child: InkResponse(
// onTap: () { onTap: () {
// disProvider.initializeForm(context); disProvider.initializeForm(context);
// _showDispatchSheet(context, "Dispatch"); disProvider.ordersDetailsDispatchOrderViewFunction(context,widget.orderId);
// }, _showDispatchSheet(context, "Dispatch");
// child: Container( },
// decoration: BoxDecoration( child: Container(
// borderRadius: BorderRadius.circular(8), decoration: BoxDecoration(
// color: Color(0xFFFFEFEF), borderRadius: BorderRadius.circular(8),
// border: Border.all( color: Color(0xFFFFEFEF),
// color: Color(0xFFED3424), border: Border.all(
// width: 0.5, color: Color(0xFFED3424),
// ), width: 0.5,
// ), ),
// child: Center( ),
// child: Text( child: Center(
// "Dispatch", child: Text(
// style: TextStyle( "Dispatch",
// color: Color(0xFFED3424), style: TextStyle(
// ), color: Color(0xFFED3424),
// ), ),
// ), ),
// ), ),
// ), ),
// ), ),
),
], ],
], ],
), ),
...@@ -413,15 +568,15 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -413,15 +568,15 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
children: [ children: [
SizedBox(height: 15), SizedBox(height: 15),
...List.generate(3, (index) { ...List.generate(4, (index) {
final assetnames = [ final assetnames = [
// "crm_contact_edit", "crm_contact_edit",
"order_list_svg_2", "order_list_svg_2",
"order_list_svg_3", "order_list_svg_3",
"order_list_svg_3", "order_list_svg_3",
]; ];
final Headingnames = [ final Headingnames = [
// "Edit Order", "Edit Order",
"Payment History", "Payment History",
"Products Details", "Products Details",
"Feedback History", "Feedback History",
...@@ -840,6 +995,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -840,6 +995,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
textControllerWidget( textControllerWidget(
context, context,
disProvider.invoiceNumberController, disProvider.invoiceNumberController,
"Invoice Number",
"Enter Invoice Number", "Enter Invoice Number",
disProvider.onChangedinvoiceNumber, disProvider.onChangedinvoiceNumber,
TextInputType.text, TextInputType.text,
...@@ -850,6 +1006,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -850,6 +1006,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
textControllerWidget( textControllerWidget(
context, context,
disProvider.vehicleNumberController, disProvider.vehicleNumberController,
"Vehicle Number",
"Enter Vehicle Number", "Enter Vehicle Number",
disProvider.onChangedvehicleNumber, disProvider.onChangedvehicleNumber,
TextInputType.text, TextInputType.text,
...@@ -860,6 +1017,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -860,6 +1017,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
textControllerWidget( textControllerWidget(
context, context,
disProvider.driverNameController, disProvider.driverNameController,
"Driver Name",
"Enter Driver Name", "Enter Driver Name",
disProvider.onChangeddriverName, disProvider.onChangeddriverName,
TextInputType.text, TextInputType.text,
...@@ -870,6 +1028,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -870,6 +1028,7 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
textControllerWidget( textControllerWidget(
context, context,
disProvider.driverMobileNumberController, disProvider.driverMobileNumberController,
"Driver Mobile Number",
"Enter Driver Mobile Number", "Enter Driver Mobile Number",
disProvider.onChangeddriverMobileNumber, disProvider.onChangeddriverMobileNumber,
TextInputType.text, TextInputType.text,
...@@ -974,11 +1133,18 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -974,11 +1133,18 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
child: textControllerWidget( child: textControllerWidget(
context, context,
disProvider.engineNumberControllers[j], disProvider.engineNumberControllers[j],
"Engine Number",
"Enter Engine Number", "Enter Engine Number",
(value) => disProvider.updateTotalAmount(j), (p0) {
TextInputType.number, if(disProvider.engineNumberControllers[j].text.trim().isEmpty){
disProvider.pdiIDControllers[j].clear();
}
disProvider.updateTotalAmount(j);
disProvider.ordersPDIIDByEngineNumberFunction(context,j);
},
TextInputType.text,
false, false,
FilteringTextInputFormatter.digitsOnly, null,
), ),
), ),
], ],
...@@ -991,11 +1157,12 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -991,11 +1157,12 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
child: textControllerWidget( child: textControllerWidget(
context, context,
disProvider.pdiIDControllers[j], disProvider.pdiIDControllers[j],
"PDI ID",
"Enter PDI ID", "Enter PDI ID",
(value) => disProvider.updateTotalAmount(j), (value) => disProvider.updateTotalAmount(j),
TextInputType.number, TextInputType.text,
false, true,
FilteringTextInputFormatter.digitsOnly, null,
), ),
), ),
], ],
...@@ -1018,22 +1185,23 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> { ...@@ -1018,22 +1185,23 @@ class _OrdersdetailsbymodesState extends State<Ordersdetailsbymodes> {
provider.submitClicked = false; provider.submitClicked = false;
final data = disProvider.getFormData(); final data = disProvider.getFormData();
print(data); print(data);
// disProvider.approvalRejectionAPIFunction( disProvider.approvalRejectionAPIFunction(
// context, context,
// details.status, details.status,
// details.id, details.id,
// type == "Dispatch", type == "Dispatch",
// provider.approveRejectFeedbackController.text, provider.approveRejectFeedbackController.text,
// details.tpcApplicable, details.tpcApplicable,
// details.tpcApplicable == "Yes" details.tpcApplicable == "Yes"
// ? (widget.mode == "level_one_approval" ? (widget.mode == "level_one_approval"
// ? details.level1TpcApprovedAmount ? details.level1TpcApprovedAmount
// : details.level2TpcApprovedAmount) : details.level2TpcApprovedAmount)
// : "", : "",
// provider.saleOrderNumberController.text, provider.saleOrderNumberController.text,
// provider.editCompanyController.text, provider.editCompanyController.text,
// data, data,
// ); widget.mode
);
}, },
child: Container( child: Container(
......
lib/screens/order/ordersListByModes.dart
View file @ 2ccf19cc
...@@ -14,7 +14,12 @@ import '../commonDateRangeFilter.dart'; ...@@ -14,7 +14,12 @@ import '../commonDateRangeFilter.dart';
class OrderslistbyModes extends StatefulWidget { class OrderslistbyModes extends StatefulWidget {
final mode; final mode;
final pageTitleName; final pageTitleName;
const OrderslistbyModes({super.key,required this.mode,required this.pageTitleName});
const OrderslistbyModes({
super.key,
required this.mode,
required this.pageTitleName,
});
@override @override
State<OrderslistbyModes> createState() => _OrderslistbyModesState(); State<OrderslistbyModes> createState() => _OrderslistbyModesState();
...@@ -33,11 +38,10 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -33,11 +38,10 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
listen: false, listen: false,
); );
provider.ordersListByModeFilterAPIFunction(context, widget.mode); provider.ordersListByModeFilterAPIFunction(context, widget.mode);
provider.ordersListByModeAPIFunction(context, widget.mode,"",""); provider.ordersListByModeAPIFunction(context, widget.mode, "", "");
}); });
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Consumer<Pagesdashboardprovider>( return Consumer<Pagesdashboardprovider>(
...@@ -53,253 +57,267 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -53,253 +57,267 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
appBar: appbar2( appBar: appbar2(
context, context,
widget.pageTitleName, widget.pageTitleName,
provider.resetAll, provider.resetAll,
Row( Row(
children: [ children: [
InkResponse( InkResponse(
onTap: () { onTap: () {
_showOptionsSheet(context); _showOptionsSheet(context);
}, },
child: SvgPicture.asset("assets/svg/ic_download.svg",), child: SvgPicture.asset("assets/svg/ic_download.svg"),
), ),
InkResponse( InkResponse(
onTap: () async { onTap: () async {
_showFilterSheet(context); _showFilterSheet(context);
}, },
child:SvgPicture.asset("assets/svg/filter_ic.svg",height: 25,), child: SvgPicture.asset(
"assets/svg/filter_ic.svg",
height: 25,
),
), ),
], ],
), ),
), ),
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
body: body:
provider.isLoading provider.isLoading
? Center(child: CircularProgressIndicator.adaptive( ? Center(
valueColor: AlwaysStoppedAnimation<Color>( child: CircularProgressIndicator.adaptive(
AppColors.app_blue) valueColor: AlwaysStoppedAnimation<Color>(
)) AppColors.app_blue,
: ordersList.isNotEmpty?SingleChildScrollView(
child: Column(
children: [
ListView.builder(
itemCount: ordersList.length,
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
if (ordersList.isEmpty ) {
return SizedBox(
child: Center(
child: Text("No Data Available"),
),
);
}
return Container(
padding: EdgeInsets.symmetric(
horizontal: 10,
vertical: 10,
), ),
margin: EdgeInsets.symmetric( ),
horizontal: 10, )
vertical: 10, : ordersList.isNotEmpty
), ? SingleChildScrollView(
decoration: BoxDecoration( child: Column(
color: Colors.white, children: [
borderRadius: BorderRadius.circular(16), ListView.builder(
), itemCount: ordersList.length,
child: Column( shrinkWrap: true,
children: [ physics: NeverScrollableScrollPhysics(),
Row( itemBuilder: (context, index) {
children: [ if (ordersList.isEmpty) {
Expanded( return SizedBox(
flex: 1, child: Center(
child: Container( child: Text("No Data Available"),
height: 50,
width: 35,
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Color(0xFFFFF3CE),
borderRadius:
BorderRadius.circular(8),
),
child: SvgPicture.asset(
"assets/svg/fin_ic.svg",
),
), ),
);
}
if(ordersList[index].orderNumber=="GP20252605448")
return Container(
padding: EdgeInsets.symmetric(
horizontal: 10,
vertical: 10,
), ),
SizedBox(width: 10), margin: EdgeInsets.symmetric(
Expanded( horizontal: 10,
flex: 4, vertical: 10,
child: SizedBox( ),
child: Column( decoration: BoxDecoration(
crossAxisAlignment: color: Colors.white,
CrossAxisAlignment.start, borderRadius: BorderRadius.circular(16),
),
child: Column(
children: [
Row(
children: [ children: [
Text( Expanded(
ordersList[index].accountName!, flex: 1,
style: TextStyle( child: Container(
fontFamily: height: 50,
"JakartaMedium", width: 35,
fontSize: 14, padding: EdgeInsets.all(8.0),
color: decoration: BoxDecoration(
AppColors.semi_black, color: Color(0xFFFFF3CE),
borderRadius:
BorderRadius.circular(8),
),
child: SvgPicture.asset(
"assets/svg/fin_ic.svg",
),
), ),
), ),
Text( SizedBox(width: 10),
"₹" Expanded(
"${ordersList[index].balanceAmount}", flex: 4,
style: TextStyle( child: SizedBox(
fontFamily: child: Column(
"JakartaMedium", crossAxisAlignment:
fontSize: 14, CrossAxisAlignment.start,
color: AppColors.app_blue, children: [
Text(
ordersList[index]
.accountName!,
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.semi_black,
),
),
Text(
"₹"
"${ordersList[index].balanceAmount}",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.app_blue,
),
),
],
),
),
),
Expanded(
flex: 2,
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 5,
vertical: 10,
),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(8),
color: Color(0xFFE3FFE0),
),
child: Center(
child: Text(
ordersList[index].status!,
textAlign: TextAlign.center,
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: Color(0xFF0D9C00),
),
),
),
), ),
), ),
], ],
), ),
), Divider(
), thickness: 0.5,
Expanded( color: Color(0xFFD7D7D7),
flex: 2,
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 5,
vertical: 10,
), ),
decoration: BoxDecoration( ...List.generate(5, (j) {
borderRadius: final headings = [
BorderRadius.circular(8), "Order Number",
color: Color(0xFFE3FFE0), "Entered Employee",
), "Sales Person",
child: Center( // "Date",
child: Text( "Paid Amount",
ordersList[index].status!, "Balance Amount",
textAlign: TextAlign.center, ];
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: Color(0xFF0D9C00),
),
),
),
),
),
],
),
Divider(
thickness: 0.5,
color: Color(0xFFD7D7D7),
),
...List.generate(5, (j) {
final headings = [
"Entered Employee",
"Sales Person",
"Date",
"Paid Amount",
"Balance Amount",
];
final subHeadings = [ final subHeadings = [
ordersList[index].enteredEmpName, ordersList[index].orderNumber,
ordersList[index].salesPersonEmpName, ordersList[index].enteredEmpName,
ordersList[index].createdDatetime, ordersList[index].salesPersonEmpName,
ordersList[index].paidAmount, // ordersList[index].createdDatetime,
ordersList[index].balanceAmount, ordersList[index].paidAmount,
]; ordersList[index].balanceAmount,
return Container( ];
padding: EdgeInsets.symmetric( return Container(
vertical: 5, padding: EdgeInsets.symmetric(
), vertical: 5,
child: Row(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Expanded(
child: Text(
headings[j],
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.semi_black,
), ),
), child: Row(
), crossAxisAlignment:
Expanded( CrossAxisAlignment.start,
child: InkResponse( children: [
Expanded(
child: Text( child: Text(
subHeadings[j]!, headings[j],
style: TextStyle( style: TextStyle(
fontSize: 14, fontFamily: "JakartaMedium",
color:Color( fontSize: 14,
0xFF818181, color: AppColors.semi_black,
),
),
),
Expanded(
child: InkResponse(
child: Text(
subHeadings[j]!,
style: TextStyle(
fontSize: 14,
color: Color(0xFF818181),
decoration:
TextDecoration.none,
decorationColor:
AppColors.white,
),
),
),
), ),
decoration: TextDecoration ],
.none, ),
decorationColor: AppColors.white, );
}),
InkResponse(
onTap: () async {
var res = await Navigator.push(
context,
MaterialPageRoute(
builder:
(context) =>
Ordersdetailsbymodes(
pageTitleName:
widget.pageTitleName,
orderId:
ordersList[index]
.orderId,
mode: widget.mode,
),
), ),
);
if(res==true){
provider.ordersListByModeFilterAPIFunction(context, widget.mode);
provider.ordersListByModeAPIFunction(context, widget.mode, "", "");
}
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 5,
), ),
), child: Row(
), crossAxisAlignment:
], CrossAxisAlignment.center,
), mainAxisAlignment:
); MainAxisAlignment.start,
}), children: [
InkResponse( Text(
onTap: () async { "View Details",
Navigator.push( style: TextStyle(
context, fontFamily: "JakartaMedium",
MaterialPageRoute( fontSize: 14,
builder: color: AppColors.app_blue,
(context) => ),
Ordersdetailsbymodes( ),
pageTitleName: widget.pageTitleName, SizedBox(width: 5),
orderId: SvgPicture.asset(
ordersList[index].orderId, "assets/svg/next_button.svg",
mode: widget.mode, ),
],
), ),
),
);
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 5,
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.start,
children: [
Text(
"View Details",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.app_blue,
), ),
), ),
SizedBox(width: 5),
SvgPicture.asset(
"assets/svg/next_button.svg",
),
], ],
), ),
), );
), },
], ),
), ],
); ),
}, )
), : Emptywidget(context),
],
),
):Emptywidget(context),
), ),
); );
}, },
); );
} }
Future<void> _showOptionsSheet(BuildContext context) { Future<void> _showOptionsSheet(BuildContext context) {
return showModalBottomSheet( return showModalBottomSheet(
useSafeArea: true, useSafeArea: true,
...@@ -322,7 +340,9 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -322,7 +340,9 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
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,
...@@ -431,61 +451,74 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -431,61 +451,74 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
), ),
), ),
), ),
if(["admin","teamleader"].contains(widget.mode))...[ if ([
Text( "admin",
"Select Status", "teamleader",
style: TextStyle(color: Color(0xFF2D2D2D)), ].contains(widget.mode)) ...[
), Text(
DropdownButtonHideUnderline( "Select Status",
child: Row( style: TextStyle(color: Color(0xFF2D2D2D)),
children: [ ),
Expanded( DropdownButtonHideUnderline(
child: DropdownButton2<String>( child: Row(
isExpanded: true, children: [
hint: const Row( Expanded(
children: [ child: DropdownButton2<String>(
Expanded( isExpanded: true,
child: Text( hint: const Row(
'Select Account', children: [
style: TextStyle(fontSize: 14), Expanded(
overflow: TextOverflow.ellipsis, child: Text(
), 'Select Account',
), style: TextStyle(fontSize: 14),
], overflow: TextOverflow.ellipsis,
), ),
items:
provider.leadStatus
.map(
(status) => DropdownMenuItem<String>(
value: status,
child: Text(
status,
style: const TextStyle(
fontSize: 14,
), ),
overflow: TextOverflow.ellipsis, ],
),
), ),
) items:
.toList(), provider.leadStatus
value: provider.selectedLeadType, .map(
onChanged: (value) { (status) =>
if (value != null) { DropdownMenuItem<String>(
provider.selectedLeadType = value; value: status,
print( child: Text(
"statusId:${provider.selectedLeadType}", status,
); style: const TextStyle(
} fontSize: 14,
}, ),
buttonStyleData: ddtheme.buttonStyleData, overflow:
iconStyleData: ddtheme.iconStyleData, TextOverflow
menuItemStyleData: ddtheme.menuItemStyleData, .ellipsis,
dropdownStyleData: ddtheme.dropdownStyleData, ),
),
)
.toList(),
value:
provider.leadStatus.contains(
provider.selectedLeadType,
)
? provider.selectedLeadType
: null,
onChanged: (value) {
if (value != null) {
provider.selectedLeadType = value;
print(
"statusId:${provider.selectedLeadType}",
);
}
},
buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData,
menuItemStyleData:
ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
),
), ),
), ],
], ),
), ),
),
], ],
Text( Text(
"Select Employee", "Select Employee",
...@@ -503,22 +536,22 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -503,22 +536,22 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
items: items:
provider.employeesList provider.employeesList
.map( .map(
(emps) => (emps) =>
DropdownMenuItem<Employees>( DropdownMenuItem<Employees>(
value: emps, value: emps,
child: Text( child: Text(
emps.name ?? '', emps.name ?? '',
style: const TextStyle( style: const TextStyle(
fontSize: 14, fontSize: 14,
), ),
overflow: overflow:
TextOverflow.ellipsis, TextOverflow.ellipsis,
), ),
), ),
) )
.toList(), .toList(),
value: provider.selectedEmployee, value: provider.selectedEmployee,
onChanged: (Employees? value) { onChanged: (Employees? value) {
if (value != null) { if (value != null) {
...@@ -528,20 +561,22 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -528,20 +561,22 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
"Selected Complaint Type: ${value.name}, ID: ${value.id}", "Selected Complaint Type: ${value.name}, ID: ${value.id}",
); );
provider.selectedEmpID = value.id!; provider.selectedEmpID = value.id!;
provider.selectedEmpName = value.name!; provider.selectedEmpName =
value.name!;
print( print(
"hfjkshfg" + "hfjkshfg" +
provider.selectedEmpID provider.selectedEmpID
.toString(), .toString(),
); );
} }
} }
}, },
buttonStyleData: ddtheme.buttonStyleData, buttonStyleData: ddtheme.buttonStyleData,
iconStyleData: ddtheme.iconStyleData, iconStyleData: ddtheme.iconStyleData,
menuItemStyleData: ddtheme.menuItemStyleData, menuItemStyleData:
dropdownStyleData: ddtheme.dropdownStyleData, ddtheme.menuItemStyleData,
dropdownStyleData:
ddtheme.dropdownStyleData,
), ),
), ),
], ],
...@@ -550,13 +585,24 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> { ...@@ -550,13 +585,24 @@ class _OrderslistbyModesState extends State<OrderslistbyModes> {
InkResponse( InkResponse(
onTap: () { onTap: () {
Navigator.pop(context); Navigator.pop(context);
provider.ordersListByModeAPIFunction(context, widget.mode, provider.selectedEmpID, provider.selectedLeadType); provider.ordersListByModeAPIFunction(
context,
widget.mode,
provider.selectedEmpID,
provider.selectedLeadType,
);
}, },
child: Container( child: Container(
height: 45, height: 45,
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.symmetric(horizontal: 10,vertical: 15), margin: EdgeInsets.symmetric(
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), horizontal: 10,
vertical: 15,
),
padding: EdgeInsets.symmetric(
horizontal: 10,
vertical: 5,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColors.app_blue, color: AppColors.app_blue,
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
......
lib/screens/order/tpcAgentIssueListDetails.dart
View file @ 2ccf19cc
...@@ -30,6 +30,8 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> { ...@@ -30,6 +30,8 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
context, context,
listen: false, listen: false,
); );
provider.showMoreDetails = false;
provider.ordersDetailsByModeAPIFunction( provider.ordersDetailsByModeAPIFunction(
context, widget.orderId, widget.mode); context, widget.orderId, widget.mode);
}); });
...@@ -42,6 +44,133 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> { ...@@ -42,6 +44,133 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
builder: (context, provider,tpcProvider, child) { builder: (context, provider,tpcProvider, child) {
var orderDetails = provider.orderDetails; var orderDetails = provider.orderDetails;
var Headings1 = [
"Order Number",
"Account Name",
"Sales Person Name",
"Order Received Date",
];
var subHeadings1 = [
provider.orderDetails.orderNumber ?? "-",
provider.orderDetails.accountName ?? "-",
provider.orderDetails.salesPersonEmpName ?? "-",
provider.orderDetails.orderReceivedDate ?? "-",
];
var Headings2 = [
"Billing State",
"Billing District",
"Billing Sub Location",
"Billing Pincode",
"Billing Address",
"Entered By",
"Dispatch State",
"Dispatch District",
"District Sub Location",
"Dispatch Pincode",
"Dispatch Address",
"GST Number",
"Unloading Scope",
"Freight Scope",
"Erection Scope",
"CGST Amount",
"SGST Amount",
"IGST Amount",
"OTP",
"Basic Amount",
"Paid Amount",
"Balance Amount",
"Total Amount",
"TPC Applicable",
"TPC Agent",
"TPC Requested Amount",
"TPC Level 1 Approved Amount",
"TPC Level 2 Approved Amount",
"TPC Payment Mode",
"TPC Payment Reference No",
"TPC Payment Attachment",
"TPC Status",
"Purchase Order",
"Created Datetime",
"Note",
"Status",
];
var subHeadings2 = [
provider.orderDetails.billingState ?? "-",
provider.orderDetails.billingDistrict ?? "-",
provider.orderDetails.billingSubLocality ?? "-",
provider.orderDetails.billingPincode ?? "-",
provider.orderDetails.billingAddress ?? "-",
provider.orderDetails.enteredEmpName ?? "-",
provider.orderDetails.stateName ?? "-",
provider.orderDetails.districtName ?? "-",
provider.orderDetails.subLocationName ?? "-",
provider.orderDetails.dispatchPincode ?? "-",
provider.orderDetails.dispatchAddress ?? "-",
provider.orderDetails.gstNumber ?? "-",
provider.orderDetails.unloadingScope ?? "-",
provider.orderDetails.freightScope ?? "-",
provider.orderDetails.erectionScope ?? "-",
provider.orderDetails.cgstAmount ?? "-",
provider.orderDetails.sgstAmount ?? "-",
provider.orderDetails.igstAmount ?? "-",
provider.orderDetails.otp ?? "-",
provider.orderDetails.basicAmount ?? "-",
provider.orderDetails.paidAmount ?? "-",
provider.orderDetails.balanceAmount ?? "-",
provider.orderDetails.totalAmount ?? "-",
provider.orderDetails.tpcApplicable ?? "-",
provider.orderDetails.tpcaAgentName ?? "-",
provider.orderDetails.requestedTpcAmount ?? "-",
provider.orderDetails.level1TpcApprovedAmount ?? "-",
provider.orderDetails.level2TpcApprovedAmount ?? "-",
provider.orderDetails.tpcPaymentMode ?? "-",
provider.orderDetails.tpcPaymentReferenceNo ?? "-",
provider.orderDetails.tpcPaymentAttachementViewFileName ?? "-",
provider.orderDetails.tpcStatus ?? "-",
provider.orderDetails.tpcPaymentAttachmentDirFilePath ?? "-",
provider.orderDetails.createdDatetime ?? "-",
provider.orderDetails.note ?? "-",
provider.orderDetails.status ?? "-",
];
var Headings = [...Headings1];
var subHeadings = [...subHeadings1];
if(provider.showMoreDetails){
Headings = [...Headings1,...Headings2];
subHeadings = [...subHeadings1,...subHeadings2];
}
return WillPopScope( return WillPopScope(
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
...@@ -135,7 +264,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> { ...@@ -135,7 +264,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
], ],
), ),
Divider(thickness: 0.5, color: Color(0xFFD7D7D7)), Divider(thickness: 0.5, color: Color(0xFFD7D7D7)),
...List.generate(provider.subHeadings.length, (j) { ...List.generate(subHeadings.length, (j) {
return Container( return Container(
padding: EdgeInsets.symmetric(vertical: 7), padding: EdgeInsets.symmetric(vertical: 7),
child: Row( child: Row(
...@@ -143,7 +272,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> { ...@@ -143,7 +272,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
provider.Headings[j], Headings[j],
style: TextStyle( style: TextStyle(
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
fontSize: 14, fontSize: 14,
...@@ -154,7 +283,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> { ...@@ -154,7 +283,7 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
Expanded( Expanded(
child: InkResponse( child: InkResponse(
onTap: () { onTap: () {
if (provider.Headings[j] == if (Headings[j] ==
"Purchase Order") { "Purchase Order") {
Navigator.push( Navigator.push(
context, context,
...@@ -174,21 +303,21 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> { ...@@ -174,21 +303,21 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
} }
}, },
child: Text( child: Text(
provider.Headings[j] == "Purchase Order" Headings[j] == "Purchase Order"
? "View" ? "View"
: "${provider.subHeadings[j]}", : "${subHeadings[j]}",
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: color:
provider.Headings[j] == "Purchase Order" Headings[j] == "Purchase Order"
? AppColors.app_blue ? AppColors.app_blue
: Color(0xFF818181), : Color(0xFF818181),
decoration: decoration:
provider.Headings[j] == "Purchase Order" Headings[j] == "Purchase Order"
? TextDecoration.underline ? TextDecoration.underline
: TextDecoration.none, : TextDecoration.none,
decorationColor: decorationColor:
provider.Headings[j] == "Purchase Order" Headings[j] == "Purchase Order"
? AppColors.app_blue ? AppColors.app_blue
: AppColors.white, : AppColors.white,
), ),
...@@ -199,6 +328,33 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> { ...@@ -199,6 +328,33 @@ class _TpcagentissuelistdetailsState extends State<Tpcagentissuelistdetails> {
), ),
); );
}), }),
InkResponse(
onTap: () async {
provider.showMoreDetails = !provider.showMoreDetails;
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 5,
),
child: Row(
crossAxisAlignment:
CrossAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Text(
provider.showMoreDetails?"- Show Less": "+ More Details",
style: TextStyle(
fontFamily: "JakartaMedium",
fontSize: 14,
color: AppColors.app_blue,
),
),
],
),
),
),
], ],
), ),
), ),
......
lib/screens/order/tpcAgentListByMode.dart
View file @ 2ccf19cc
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:generp/Notifiers/ordersProvider/tpcAgentsProvider.dart'; import 'package:generp/Notifiers/ordersProvider/tpcAgentsProvider.dart';
import 'package:generp/screens/finance/FileViewer.dart';
import 'package:generp/screens/order/tpcAgentDetailsByMode.dart'; import 'package:generp/screens/order/tpcAgentDetailsByMode.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
...@@ -10,7 +11,9 @@ import '../../Utils/commonWidgets.dart'; ...@@ -10,7 +11,9 @@ import '../../Utils/commonWidgets.dart';
class Tpcagentlistbymode extends StatefulWidget { class Tpcagentlistbymode extends StatefulWidget {
final pageTitleName; final pageTitleName;
final mode; final mode;
const Tpcagentlistbymode({super.key,required this.pageTitleName,required this.mode});
const Tpcagentlistbymode(
{super.key, required this.pageTitleName, required this.mode});
@override @override
State<Tpcagentlistbymode> createState() => _TpcagentlistbymodeState(); State<Tpcagentlistbymode> createState() => _TpcagentlistbymodeState();
...@@ -57,7 +60,7 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> { ...@@ -57,7 +60,7 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> {
child: SvgPicture.asset("assets/svg/ic_download.svg",), child: SvgPicture.asset("assets/svg/ic_download.svg",),
), ),
], ],
), ),
), ),
...@@ -136,7 +139,8 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> { ...@@ -136,7 +139,8 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> {
), ),
Text( Text(
"${tpcAgentsLists[index].createdDatetime}", "${tpcAgentsLists[index]
.mobileNumber}",
style: TextStyle( style: TextStyle(
fontFamily: fontFamily:
"JakartaMedium", "JakartaMedium",
...@@ -157,16 +161,16 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> { ...@@ -157,16 +161,16 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> {
), ),
...List.generate(4, (j) { ...List.generate(4, (j) {
final headings = [ final headings = [
"Mobile Number",
"Entered Employee", "Entered Employee",
"Issued Amount", "Issued Amount",
"ID Proof",
"Description", "Description",
]; ];
final subHeadings = [ final subHeadings = [
tpcAgentsLists[index].mobileNumber,
tpcAgentsLists[index].enteredEmpName, tpcAgentsLists[index].enteredEmpName,
tpcAgentsLists[index].issuedAmount, tpcAgentsLists[index].issuedAmount,
"View",
tpcAgentsLists[index].note, tpcAgentsLists[index].note,
]; ];
return Container( return Container(
...@@ -187,23 +191,55 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> { ...@@ -187,23 +191,55 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> {
), ),
), ),
), ),
Expanded( if(subHeadings[j] == "View")...[
child: InkResponse( Expanded(
child: InkResponse(
child: Text( onTap: () {
"${subHeadings[j]}", Navigator.push(context,
style: TextStyle( MaterialPageRoute(
fontSize: 14, builder: (context) =>
color: Color( Fileviewer(
0xFF818181, fileName: tpcAgentsLists[index]
.idProofViewFileName ??
"-",
fileUrl: tpcAgentsLists[index]
.idProofDirFilePath ??
"-"),));
},
child: Text(
"${subHeadings[j]}",
style: TextStyle(
fontSize: 14,
color:AppColors.app_blue,
decoration: TextDecoration
.underline,
decorationColor: AppColors.app_blue,
), ),
decoration: TextDecoration
.none,
decorationColor: AppColors.white,
), ),
), ),
), ),
), ] else
...[
Expanded(
child: InkResponse(
child: Text(
"${subHeadings[j]}",
style: TextStyle(
fontSize: 14,
color: Color(
0xFF818181,
),
decoration: TextDecoration
.none,
decorationColor: AppColors
.white,
),
),
),
),
]
], ],
), ),
); );
...@@ -214,7 +250,8 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> { ...@@ -214,7 +250,8 @@ class _TpcagentlistbymodeState extends State<Tpcagentlistbymode> {
builder: (context) => builder: (context) =>
Tpcagentdetailsbymode(mode: widget.mode, Tpcagentdetailsbymode(mode: widget.mode,
pageTitleName: widget.pageTitleName, pageTitleName: widget.pageTitleName,
tpcAgentId: tpcAgentsLists[index].tpcAgentId, tpcAgentId: tpcAgentsLists[index]
.tpcAgentId,
),)); ),));
}, },
child: Container( child: Container(
......
lib/screens/serviceEngineer/PaymentDetails.dart
View file @ 2ccf19cc
...@@ -56,9 +56,6 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -56,9 +56,6 @@ class _PaymentdetailsState extends State<Paymentdetails> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Consumer<Paymentdetailsprovider>( return Consumer<Paymentdetailsprovider>(
builder: (context, provider, child) { builder: (context, provider, child) {
// Debug prints to inspect contactsDropDown and selectContact
debugPrint("contactsDropDown: ${provider.contactsDropDown}");
debugPrint("selectContact: ${provider.selectContact}");
return WillPopScope( return WillPopScope(
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
child: Scaffold( child: Scaffold(
...@@ -112,7 +109,6 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -112,7 +109,6 @@ class _PaymentdetailsState extends State<Paymentdetails> {
...provider.contactsDropDown.map((contacts) { ...provider.contactsDropDown.map((contacts) {
return DropdownMenuItem<Contacts>( return DropdownMenuItem<Contacts>(
value: contacts, value: contacts,
// You can use the entire object, but we need to ensure it's unique
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment crossAxisAlignment: CrossAxisAlignment
.start, .start,
...@@ -146,6 +142,7 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -146,6 +142,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
_addContactSheet(context); _addContactSheet(context);
}, },
child: Container( child: Container(
height: 45,
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: AppColors.app_blue, color: AppColors.app_blue,
...@@ -154,7 +151,7 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -154,7 +151,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
borderRadius: BorderRadius.circular(12) borderRadius: BorderRadius.circular(12)
), ),
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
vertical: 12, horizontal: 14), vertical: 5, horizontal: 14),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment mainAxisAlignment: MainAxisAlignment
.center, .center,
...@@ -199,7 +196,7 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -199,7 +196,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
SizedBox(height: 10,), SizedBox(height: 10,),
Padding( Padding(
padding: const EdgeInsets.only(bottom: 5.0), padding: const EdgeInsets.only(bottom: 5.0),
child: Text("Complaint Type"), child: Text("Payment Type"),
), ),
DropdownButtonHideUnderline( DropdownButtonHideUnderline(
child: Row( child: Row(
...@@ -211,7 +208,7 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -211,7 +208,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
'Select Complaint Type', 'Select Payment Type',
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
), ),
...@@ -360,7 +357,7 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -360,7 +357,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
color: AppColors.app_blue, width: 0.5) color: AppColors.app_blue, width: 0.5)
), ),
child: Center( child: Center(
child: Text("Scan Document", style: TextStyle( child: Text("Reference Document", style: TextStyle(
fontFamily: "JakartaMedium", fontFamily: "JakartaMedium",
color: AppColors.app_blue color: AppColors.app_blue
),), ),),
...@@ -398,10 +395,11 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -398,10 +395,11 @@ class _PaymentdetailsState extends State<Paymentdetails> {
.centerFloat, .centerFloat,
floatingActionButton: InkWell( floatingActionButton: InkWell(
onTap: () { onTap: () {
provider.CheckValidations( print("clicked");
provider.PaymentUpdateAPI(
context, Referencecontroller.text, Amountcontroller.text); context, Referencecontroller.text, Amountcontroller.text);
if (provider.CollectionId != 0) { if (provider.CollectionId != 0) {
_showOTPSheetSheet(context); showOTPSheetSheet(context);
} }
}, },
child: Container( child: Container(
...@@ -524,7 +522,7 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -524,7 +522,7 @@ class _PaymentdetailsState extends State<Paymentdetails> {
} }
Future<void> _showOTPSheetSheet(BuildContext context) { Future<void> showOTPSheetSheet(BuildContext context) {
return showModalBottomSheet( return showModalBottomSheet(
useSafeArea: true, useSafeArea: true,
isDismissible: true, isDismissible: true,
...@@ -673,16 +671,46 @@ class _PaymentdetailsState extends State<Paymentdetails> { ...@@ -673,16 +671,46 @@ class _PaymentdetailsState extends State<Paymentdetails> {
onPressed: onPressed:
() => () =>
{ {
Navigator.of(context).pop(false),
provider.OTPVerifyAPI(context),
}, },
child: Text( child: Text(
"Submit", "Resend",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w300), fontWeight: FontWeight.w300),
), ),
), ),
), ),
InkResponse(
onTap: () {
Navigator.of(context).pop(false);
provider.OTPVerifyAPI(context);
},
child: Container(
alignment: Alignment.center,
height: 45,
margin: EdgeInsets.only(
left: 5.0,
right: 5.0,
top: 5.0,
bottom: 5.0,
),
decoration: BoxDecoration(
color: AppColors.app_blue, //1487C9
borderRadius: BorderRadius.circular(15.0),
),
child: Center(
child: Text(
"Submit",
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 15,
fontFamily: "JakartaMedium",
color: Colors.white),
),
),
),
),
], ],
), ),
], ],
......
lib/services/api_calling.dart
View file @ 2ccf19cc
...@@ -24,6 +24,7 @@ import 'package:generp/Models/financeModels/paymentRequisitionPaymentsListRespon ...@@ -24,6 +24,7 @@ import 'package:generp/Models/financeModels/paymentRequisitionPaymentsListRespon
import 'package:generp/Models/ordersModels/PendingTPCAgentListResponse.dart'; import 'package:generp/Models/ordersModels/PendingTPCAgentListResponse.dart';
import 'package:generp/Models/ordersModels/TPCAgentDetailsResponse.dart'; import 'package:generp/Models/ordersModels/TPCAgentDetailsResponse.dart';
import 'package:generp/Models/ordersModels/TPCListResponse.dart'; import 'package:generp/Models/ordersModels/TPCListResponse.dart';
import 'package:generp/Models/ordersModels/orderDashboardResponse.dart';
import 'package:generp/services/api_names.dart'; import 'package:generp/services/api_names.dart';
import 'package:generp/services/api_post_request.dart'; import 'package:generp/services/api_post_request.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
...@@ -59,6 +60,10 @@ import '../Models/UpdateComplaintResponse.dart'; ...@@ -59,6 +60,10 @@ import '../Models/UpdateComplaintResponse.dart';
import '../Models/UpdatePasswordResponse.dart'; import '../Models/UpdatePasswordResponse.dart';
import '../Models/VersionsResponse.dart'; import '../Models/VersionsResponse.dart';
import '../Models/ViewVisitDetailsResponse.dart'; import '../Models/ViewVisitDetailsResponse.dart';
import '../Models/commonModels/commonAddAccountsSubmitResponse.dart';
import '../Models/crmModels/crmDashboardResponse.dart';
import '../Models/crmModels/crmPendingTasksResponse.dart';
import '../Models/crmModels/crmUniversalSearchResponse.dart';
import '../Models/financeModels/paymentRequestionBankDetailsResponse.dart'; import '../Models/financeModels/paymentRequestionBankDetailsResponse.dart';
import '../Models/commonModels/commonAccountLedgerFilterResponse.dart'; import '../Models/commonModels/commonAccountLedgerFilterResponse.dart';
import '../Models/commonModels/commonAccountLedgerResponse.dart'; import '../Models/commonModels/commonAccountLedgerResponse.dart';
...@@ -89,12 +94,14 @@ import '../Models/ordersModels/addOrderAccontDetailsResponse.dart'; ...@@ -89,12 +94,14 @@ import '../Models/ordersModels/addOrderAccontDetailsResponse.dart';
import '../Models/ordersModels/addOrderPaymentViewResponse.dart'; import '../Models/ordersModels/addOrderPaymentViewResponse.dart';
import '../Models/ordersModels/addOrderTpcAgentListResponse.dart'; import '../Models/ordersModels/addOrderTpcAgentListResponse.dart';
import '../Models/ordersModels/commonResponse.dart'; import '../Models/ordersModels/commonResponse.dart';
import '../Models/ordersModels/orderPendingTasksListResponse.dart';
import '../Models/ordersModels/ordersAccessiblePagesResponse.dart'; import '../Models/ordersModels/ordersAccessiblePagesResponse.dart';
import '../Models/ordersModels/ordersDetailsByModeResponse.dart'; import '../Models/ordersModels/ordersDetailsByModeResponse.dart';
import '../Models/ordersModels/ordersDetailsDispatchOrderViewResponse.dart'; import '../Models/ordersModels/ordersDetailsDispatchOrderViewResponse.dart';
import '../Models/ordersModels/ordersDetailsEditOrderViewResponse.dart'; import '../Models/ordersModels/ordersDetailsEditOrderViewResponse.dart';
import '../Models/ordersModels/ordersListByModeFilterResponse.dart'; import '../Models/ordersModels/ordersListByModeFilterResponse.dart';
import '../Models/ordersModels/ordersListByModeResponse.dart'; import '../Models/ordersModels/ordersListByModeResponse.dart';
import '../Models/ordersModels/ordersPdiIdByEngNumberResponse.dart';
import '../Models/ordersModels/paymentDetailsByModeFilterResponse.dart'; import '../Models/ordersModels/paymentDetailsByModeFilterResponse.dart';
import '../Models/ordersModels/paymentListByModeFilterResponse.dart'; import '../Models/ordersModels/paymentListByModeFilterResponse.dart';
import '../Models/ordersModels/paymentListByModeResponse.dart'; import '../Models/ordersModels/paymentListByModeResponse.dart';
...@@ -357,13 +364,13 @@ class ApiCalling { ...@@ -357,13 +364,13 @@ class ApiCalling {
'location': (location).toString(), 'location': (location).toString(),
}; };
var res; var res;
if (check_in_pic != null) { // if (check_in_pic != null) {
res = await postImage(data, employeeChekInUrl, {}, check_in_pic); res = await postImage(data, employeeChekInUrl, {}, check_in_pic);
res = jsonDecode(res); res = jsonDecode(res);
} else { // } else {
res = await post(data, employeeChekInUrl, {}); // // res = await post(data, employeeChekInUrl, {});
res = jsonDecode(res.body); // // res = jsonDecode(res.body);
} // }
if (res != null) { if (res != null) {
return CheckInResponse.fromJson(res); return CheckInResponse.fromJson(res);
} else { } else {
...@@ -404,7 +411,7 @@ class ApiCalling { ...@@ -404,7 +411,7 @@ class ApiCalling {
// debugPrint("Null Response"); // debugPrint("Null Response");
// return null; // return null;
// } // }
if (check_out_pic != null) { // if (check_out_pic != null) {
res = await postImageNew( res = await postImageNew(
data, data,
{}, {},
...@@ -412,11 +419,14 @@ class ApiCalling { ...@@ -412,11 +419,14 @@ class ApiCalling {
check_out_pic, check_out_pic,
'check_out_pic', 'check_out_pic',
); );
res = jsonDecode(res); if(res!=null){
} else { res = jsonDecode(res);
res = await post(data, employeeCheckOutUrl, {}); }
res = jsonDecode(res.body);
} // } else {
// res = await post(data, employeeCheckOutUrl, {});
// res = jsonDecode(res.body);
// }
return CheckOutResponse.fromJson(res); return CheckOutResponse.fromJson(res);
} catch (e) { } catch (e) {
debugPrint('hello bev=bug $e '); debugPrint('hello bev=bug $e ');
...@@ -507,7 +517,7 @@ class ApiCalling { ...@@ -507,7 +517,7 @@ class ApiCalling {
}; };
final res = await post(data, genTrackerGeneratorDetailsUrl, {}); final res = await post(data, genTrackerGeneratorDetailsUrl, {});
if (res != null) { if (res != null) {
debugPrint(res.body); debugPrint("gen details: ${res.body}");
return loadGeneratorDetailsResponse.fromJson(jsonDecode(res.body)); return loadGeneratorDetailsResponse.fromJson(jsonDecode(res.body));
} else { } else {
debugPrint("Null Response"); debugPrint("Null Response");
...@@ -551,6 +561,7 @@ class ApiCalling { ...@@ -551,6 +561,7 @@ class ApiCalling {
session, session,
gen_hash_id, gen_hash_id,
location, location,
attachment
) async { ) async {
try { try {
Map<String, String> data = { Map<String, String> data = {
...@@ -559,13 +570,26 @@ class ApiCalling { ...@@ -559,13 +570,26 @@ class ApiCalling {
'gen_hash_id': (gen_hash_id).toString(), 'gen_hash_id': (gen_hash_id).toString(),
'location': (location).toString(), 'location': (location).toString(),
}; };
final res = await post(data, genTrackerTagLocationUrl, {}); var res;
if (res != null) { if (attachment != null) {
// debugPrint(res.body); res = await postImageNew(
return TagLocationResponse.fromJson(jsonDecode(res.body)); data,
} else { {},
debugPrint("Null Response"); genTrackerTagLocationUrl,
return null; attachment,
"attachment",
);
res = jsonDecode(res);
return TagLocationResponse.fromJson(res);
}else{
res = await post(data, genTrackerTagLocationUrl, {});
if (res != null) {
// debugPrint(res.body);
return TagLocationResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} }
} catch (e) { } catch (e) {
debugPrint('hello bev=bug $e '); debugPrint('hello bev=bug $e ');
...@@ -675,7 +699,7 @@ class ApiCalling { ...@@ -675,7 +699,7 @@ class ApiCalling {
}; };
final res = await post(data, inventoryPartDetailsUrl, {}); final res = await post(data, inventoryPartDetailsUrl, {});
if (res != null) { if (res != null) {
// debugPrint(res.body); debugPrint(res.body);
return Inventory_Part_details_response.fromJson(jsonDecode(res.body)); return Inventory_Part_details_response.fromJson(jsonDecode(res.body));
} else { } else {
debugPrint("Null Response"); debugPrint("Null Response");
...@@ -706,7 +730,8 @@ class ApiCalling { ...@@ -706,7 +730,8 @@ class ApiCalling {
}; };
final res = await post(data, inventoryStockUpdateUrl, {}); final res = await post(data, inventoryStockUpdateUrl, {});
if (res != null) { if (res != null) {
// debugPrint(res.body); print("Issue Receive $data");
debugPrint(res.body);
return loadGeneratorDetailsResponse.fromJson(jsonDecode(res.body)); return loadGeneratorDetailsResponse.fromJson(jsonDecode(res.body));
} else { } else {
debugPrint("Null Response"); debugPrint("Null Response");
...@@ -970,9 +995,13 @@ class ApiCalling { ...@@ -970,9 +995,13 @@ class ApiCalling {
payment_proof, payment_proof,
'payment_proof', 'payment_proof',
); );
print("Add Payment $res");
res = jsonDecode(res); res = jsonDecode(res);
return TechnicianAddPaymentCollectionResponse.fromJson(res); return TechnicianAddPaymentCollectionResponse.fromJson(res);
} else { } else {
print("Add Payment $res");
res = await post(data, technicianAddPaymentCollectionUrl, {}); res = await post(data, technicianAddPaymentCollectionUrl, {});
res = jsonDecode(res.body); res = jsonDecode(res.body);
return TechnicianAddPaymentCollectionResponse.fromJson(res); return TechnicianAddPaymentCollectionResponse.fromJson(res);
...@@ -999,7 +1028,7 @@ class ApiCalling { ...@@ -999,7 +1028,7 @@ class ApiCalling {
}; };
final res = await post(data, technicianPaymentCollectionOtpUrl, {}); final res = await post(data, technicianPaymentCollectionOtpUrl, {});
if (res != null) { if (res != null) {
// debugPrint(res.body); debugPrint("OTP${res.body}");
return PaymentCollectionValidateOTPResponse.fromJson( return PaymentCollectionValidateOTPResponse.fromJson(
jsonDecode(res.body), jsonDecode(res.body),
); );
...@@ -1238,7 +1267,7 @@ class ApiCalling { ...@@ -1238,7 +1267,7 @@ class ApiCalling {
}; };
final res = await post(data, financeAddFormPagesAccessUrl, {}); final res = await post(data, financeAddFormPagesAccessUrl, {});
if (res != null) { if (res != null) {
debugPrint(res.body); debugPrint("adjf:${res.body}");
return financeDashboardPagesResponse.fromJson(jsonDecode(res.body)); return financeDashboardPagesResponse.fromJson(jsonDecode(res.body));
} else { } else {
debugPrint("Null Response"); debugPrint("Null Response");
...@@ -1337,7 +1366,8 @@ class ApiCalling { ...@@ -1337,7 +1366,8 @@ class ApiCalling {
bank_ifsc_code, bank_ifsc_code,
acc_holder_name, acc_holder_name,
bank_upi_id, bank_upi_id,
attachment, approval_assignee_emp_id,
attachment,
) async { ) async {
try { try {
Map<String, String> data = { Map<String, String> data = {
...@@ -1355,6 +1385,7 @@ class ApiCalling { ...@@ -1355,6 +1385,7 @@ class ApiCalling {
'bank_ifsc_code': bank_ifsc_code.toString(), 'bank_ifsc_code': bank_ifsc_code.toString(),
'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(),
'approval_assignee_emp_id': approval_assignee_emp_id.toString(),
}; };
var res; var res;
...@@ -1690,6 +1721,7 @@ class ApiCalling { ...@@ -1690,6 +1721,7 @@ class ApiCalling {
session, session,
mode, mode,
payment_reference_number, payment_reference_number,
payment_amount,
payment_request_id, payment_request_id,
payment_account_id, payment_account_id,
processing_remarks, processing_remarks,
...@@ -1702,6 +1734,7 @@ class ApiCalling { ...@@ -1702,6 +1734,7 @@ class ApiCalling {
'type': 'approve'.toString(), 'type': 'approve'.toString(),
'mode': mode.toString(), 'mode': mode.toString(),
'payment_reference_number': payment_reference_number.toString(), 'payment_reference_number': payment_reference_number.toString(),
'payment_amount': payment_amount.toString(),
'payment_request_id': (payment_request_id).toString(), 'payment_request_id': (payment_request_id).toString(),
'payment_account_id': payment_account_id.toString(), 'payment_account_id': payment_account_id.toString(),
'processing_remarks': processing_remarks.toString(), 'processing_remarks': processing_remarks.toString(),
...@@ -1851,7 +1884,7 @@ class ApiCalling { ...@@ -1851,7 +1884,7 @@ class ApiCalling {
}; };
final res = await post(data, commonAccessiblePagesUrl, {}); final res = await post(data, commonAccessiblePagesUrl, {});
if (res != null) { if (res != null) {
debugPrint(res.body); debugPrint("CA:${res.body}");
return commonAccessiblePagesResponse.fromJson(jsonDecode(res.body)); return commonAccessiblePagesResponse.fromJson(jsonDecode(res.body));
} else { } else {
debugPrint("Null Response"); debugPrint("Null Response");
...@@ -1965,7 +1998,7 @@ class ApiCalling { ...@@ -1965,7 +1998,7 @@ class ApiCalling {
} }
} }
static Future<commonAddAccountsViewResponse?> commonAddAccountSubmitAPI( static Future<commonAddAccountsSubmitResponse?> commonAddAccountSubmitAPI(
empId, empId,
session, session,
type, type,
...@@ -2012,7 +2045,7 @@ class ApiCalling { ...@@ -2012,7 +2045,7 @@ class ApiCalling {
if (res != null) { if (res != null) {
print(data); print(data);
debugPrint(res.body); debugPrint(res.body);
return commonAddAccountsViewResponse.fromJson(jsonDecode(res.body)); return commonAddAccountsSubmitResponse.fromJson(jsonDecode(res.body));
} else { } else {
debugPrint("Null Response"); debugPrint("Null Response");
return null; return null;
...@@ -2125,7 +2158,7 @@ class ApiCalling { ...@@ -2125,7 +2158,7 @@ class ApiCalling {
} }
///Orders Module ///Orders Module
static Future<ordersAccessiblePagesResponse?> ordersDashboardAPI( static Future<ordersAccessiblePagesResponse?> ordersAccesiblePagesAPI(
empId, empId,
session, session,
) async { ) async {
...@@ -2148,6 +2181,56 @@ class ApiCalling { ...@@ -2148,6 +2181,56 @@ class ApiCalling {
} }
} }
static Future<orderPendingTasksListResponse?> orderPendingTasksListAPI(
empId,
session,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
};
final res = await post(data, ordersPendingTasksListUrl, {});
if (res != null) {
debugPrint(res.body);
return orderPendingTasksListResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<orderDashboardResponse?> ordersDashboardAPI(
empId,
session,mode,from,to,teamemployee
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'mode': (mode).toString(),
'from': (from).toString(),
'to': (to).toString(),
'teamemployee': (teamemployee).toString(),
};
final res = await post(data, ordersDashboardUrl, {});
if (res != null) {
debugPrint(res.body);
return orderDashboardResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<AddOrderViewResponse?> addOrderViewAPI( static Future<AddOrderViewResponse?> addOrderViewAPI(
empId, empId,
session, session,
...@@ -2359,7 +2442,7 @@ class ApiCalling { ...@@ -2359,7 +2442,7 @@ class ApiCalling {
}; };
final res = await post(data, ordersOrderListFilterUrl, {}); final res = await post(data, ordersOrderListFilterUrl, {});
if (res != null) { if (res != null) {
print(data); print("mode: $data");
debugPrint(res.body); debugPrint(res.body);
return ordersListByModeResponse.fromJson(jsonDecode(res.body)); return ordersListByModeResponse.fromJson(jsonDecode(res.body));
} else { } else {
...@@ -2385,8 +2468,8 @@ class ApiCalling { ...@@ -2385,8 +2468,8 @@ class ApiCalling {
}; };
final res = await post(data, ordersOrderDetailsUrl, {}); final res = await post(data, ordersOrderDetailsUrl, {});
if (res != null) { if (res != null) {
print(data); print("Order Details ${data}");
debugPrint(res.body); print("Order Details ${res.body}");
return ordersDetailsByModeResponse.fromJson(jsonDecode(res.body)); return ordersDetailsByModeResponse.fromJson(jsonDecode(res.body));
} else { } else {
debugPrint("Null Response"); debugPrint("Null Response");
...@@ -2481,20 +2564,21 @@ class ApiCalling { ...@@ -2481,20 +2564,21 @@ class ApiCalling {
) async { ) async {
try { try {
Map<String, String> data = { Map<String, String> data = {
'empId,':empId.toString(), 'emp_id':empId.toString(),
'session,':session.toString(), 'session_id':session.toString(),
'order_id,':order_id.toString(), 'order_id':order_id.toString(),
'dispatch_state_id,':dispatch_state_id.toString(), 'dispatch_state_id':dispatch_state_id.toString(),
'district,':district.toString(), 'district':district.toString(),
'sub_locality,':sub_locality.toString(), 'sub_locality':sub_locality.toString(),
'dispatch_pincode,':dispatch_pincode.toString(), 'dispatch_pincode':dispatch_pincode.toString(),
'dispatch_address,':dispatch_address.toString(), 'dispatch_address':dispatch_address.toString(),
'unloading,':unloading.toString(), 'unloading':unloading.toString(),
'freight,':freight.toString(), 'freight':freight.toString(),
'erection,':erection.toString(), 'erection':erection.toString(),
'note':note.toString(), 'note':note.toString(),
}; };
var res; var res;
print("Edit Order:$data");
if (attachment_file != null) { if (attachment_file != null) {
res = await postImageNew( res = await postImageNew(
data, data,
...@@ -2523,10 +2607,9 @@ class ApiCalling { ...@@ -2523,10 +2607,9 @@ class ApiCalling {
) async { ) async {
try { try {
Map<String, String> data = { Map<String, String> data = {
'empId,':empId.toString(), 'emp_id':empId.toString(),
'session,':session.toString(), 'session_id':session.toString(),
'order_id,':order_id.toString(), 'order_id':order_id.toString(),
}; };
final res = await post(data, ordersOrderDetailsDispatchProductsUrl, {}); final res = await post(data, ordersOrderDetailsDispatchProductsUrl, {});
...@@ -2541,6 +2624,31 @@ class ApiCalling { ...@@ -2541,6 +2624,31 @@ class ApiCalling {
return null; return null;
} }
} }
static Future<ordersPdiIdByEngNumberResponse?> ordersPdiIdByEngNumberUrlAPI(
empId,
session,
engine_number,
) async {
try {
Map<String, String> data = {
'emp_id':empId.toString(),
'session_id':session.toString(),
'engine_number':engine_number.toString(),
};
final res = await post(data, ordersPdiIdByEngNumberUrl, {});
if(res!=null){
return ordersPdiIdByEngNumberResponse.fromJson(jsonDecode(res.body));
}else{
debugPrint("Null Response");
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<CommonResponse?> ordersDetailsApproveRejectAPI( static Future<CommonResponse?> ordersDetailsApproveRejectAPI(
empId, empId,
...@@ -2579,7 +2687,7 @@ class ApiCalling { ...@@ -2579,7 +2687,7 @@ class ApiCalling {
}; };
final res = await post(data, ordersOrderApproveRejectUrl, {}); final res = await post(data, ordersOrderApproveRejectUrl, {});
if (res != null) { if (res != null) {
print(data); print("DATATATATA:: $data");
debugPrint(res.body); debugPrint(res.body);
return CommonResponse.fromJson(jsonDecode(res.body)); return CommonResponse.fromJson(jsonDecode(res.body));
} else { } else {
...@@ -2668,7 +2776,7 @@ class ApiCalling { ...@@ -2668,7 +2776,7 @@ class ApiCalling {
'ref_no': ref_no.toString(), 'ref_no': ref_no.toString(),
}; };
var res; var res;
print(data); print("Add Payment: ${data}");
if (attachment != null) { if (attachment != null) {
res = await postImageNew( res = await postImageNew(
data, data,
...@@ -3004,6 +3112,7 @@ class ApiCalling { ...@@ -3004,6 +3112,7 @@ class ApiCalling {
'note': note.toString(), 'note': note.toString(),
}; };
var res; var res;
print("add TPC: $data");
if (id_proof != null) { if (id_proof != null) {
res = await postImageNew( res = await postImageNew(
data, data,
...@@ -3018,6 +3127,7 @@ class ApiCalling { ...@@ -3018,6 +3127,7 @@ class ApiCalling {
res = jsonDecode(res.body); res = jsonDecode(res.body);
// return CommonResponse.fromJson(res); // return CommonResponse.fromJson(res);
} }
print("Add TPC: ${res}");
return CommonResponse.fromJson(res); return CommonResponse.fromJson(res);
} catch (e) { } catch (e) {
debugPrint('hello bev=bug $e '); debugPrint('hello bev=bug $e ');
...@@ -3162,6 +3272,86 @@ class ApiCalling { ...@@ -3162,6 +3272,86 @@ class ApiCalling {
} }
} }
static Future<crmDashboardResponse?> crmDashboardAPI(
empId,
session,
mode,
from,to,teamemployee
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'mode': (mode).toString(),
'from': (from).toString(),
'to': (to).toString(),
'teamemployee': (teamemployee).toString(),
};
final res = await post(data, crmDashboardUrl, {});
if (res != null) {
print(data);
debugPrint(res.body);
return crmDashboardResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<crmPendingTasksResponse?> crmPendingTasksAPI(
empId,
session,
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
};
final res = await post(data, crmPendingTasksListUrl, {});
if (res != null) {
print(data);
debugPrint(res.body);
return crmPendingTasksResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<crmUniversalSearchResponse?> crmUniversalSearchAPI(
empId,
session,
q
) async {
try {
Map<String, String> data = {
'emp_id': (empId).toString(),
'session_id': (session).toString(),
'q': (q).toString(),
};
final res = await post(data, crmUnivesalSearchUrl, {});
if (res != null) {
print(data);
debugPrint(res.body);
return crmUniversalSearchResponse.fromJson(jsonDecode(res.body));
} else {
debugPrint("Null Response");
return null;
}
} catch (e) {
debugPrint('hello bev=bug $e ');
return null;
}
}
static Future<LeadListViewResponse?> crmLeadListViewAPI( static Future<LeadListViewResponse?> crmLeadListViewAPI(
empId, empId,
session, session,
...@@ -4103,12 +4293,14 @@ class ApiCalling { ...@@ -4103,12 +4293,14 @@ class ApiCalling {
empId, empId,
session, session,
emp_loc, emp_loc,
radius
) async { ) async {
try { try {
Map<String, String> data = { Map<String, String> data = {
'emp_id': (empId).toString(), 'emp_id': (empId).toString(),
'session_id': (session).toString(), 'session_id': (session).toString(),
'emp_loc': (emp_loc).toString(), 'emp_loc': (emp_loc).toString(),
'radius':radius.toString()
}; };
final res = await post(data, crmNearbyOpenLeadsUrl, {}); final res = await post(data, crmNearbyOpenLeadsUrl, {});
if (res != null) { if (res != null) {
......
lib/services/api_names.dart
View file @ 2ccf19cc
...@@ -86,6 +86,8 @@ const commonAccountLedgerAccountDetails = "${baseUrl_test}common_account_details ...@@ -86,6 +86,8 @@ const commonAccountLedgerAccountDetails = "${baseUrl_test}common_account_details
///order Module ///order Module
const ordersAccessiblePagesUrl = "${baseUrl_test}crm_order_accessible_pages"; const ordersAccessiblePagesUrl = "${baseUrl_test}crm_order_accessible_pages";
const ordersDashboardUrl = "${baseUrl_test}order_dashboard";
const ordersPendingTasksListUrl = "${baseUrl_test}pending_tasks_list";
const ordersOrderListByModeUrl = "${baseUrl_test}crm_order_list_view"; const ordersOrderListByModeUrl = "${baseUrl_test}crm_order_list_view";
const ordersOrderListFilterUrl = "${baseUrl_test}crm_order_list_filter_submit"; const ordersOrderListFilterUrl = "${baseUrl_test}crm_order_list_filter_submit";
const ordersOrderApproveRejectUrl = "${baseUrl_test}approve_reject_crm_order"; const ordersOrderApproveRejectUrl = "${baseUrl_test}approve_reject_crm_order";
...@@ -95,6 +97,7 @@ const ordersOrderDetailsFeedbackSubmitUrl = "${baseUrl_test}crm_order_details_ad ...@@ -95,6 +97,7 @@ const ordersOrderDetailsFeedbackSubmitUrl = "${baseUrl_test}crm_order_details_ad
const ordersOrderDetailsEditOrderUrl = "${baseUrl_test}crm_edit_order_view"; const ordersOrderDetailsEditOrderUrl = "${baseUrl_test}crm_edit_order_view";
const ordersOrderDetailsEditOrderSubmitUrl = "${baseUrl_test}crm_edit_order_submit"; const ordersOrderDetailsEditOrderSubmitUrl = "${baseUrl_test}crm_edit_order_submit";
const ordersOrderDetailsDispatchProductsUrl = "${baseUrl_test}crm_dispatch_products_data"; const ordersOrderDetailsDispatchProductsUrl = "${baseUrl_test}crm_dispatch_products_data";
const ordersPdiIdByEngNumberUrl = "${baseUrl_test}get_crm_pdi_id_by_engine_number";
const ordersAddOrderViewUrl ="${baseUrl_test}add_crm_order_view"; const ordersAddOrderViewUrl ="${baseUrl_test}add_crm_order_view";
const ordersAddOrderAccountDetailsUrl ="${baseUrl_test}crm_account_details_for_add_order"; const ordersAddOrderAccountDetailsUrl ="${baseUrl_test}crm_account_details_for_add_order";
...@@ -121,6 +124,9 @@ const ordersApprovePendingTPCIssueListUrl = "${baseUrl_test}update_pending_tpc_i ...@@ -121,6 +124,9 @@ const ordersApprovePendingTPCIssueListUrl = "${baseUrl_test}update_pending_tpc_i
///Crm Module ///Crm Module
const crmAccessiblePagesUrl = "${baseUrl_test}sales_executive_crm_accessible_pages"; const crmAccessiblePagesUrl = "${baseUrl_test}sales_executive_crm_accessible_pages";
const crmDashboardUrl = "${baseUrl_test}crm_dashboard";
const crmPendingTasksListUrl = "${baseUrl_test}pending_tasks_list";
const crmUnivesalSearchUrl = "${baseUrl_test}crm_universal_search";
const crmLeadListViewUrl = "${baseUrl_test}crm_lead_list_view"; const crmLeadListViewUrl = "${baseUrl_test}crm_lead_list_view";
const crmLeadListFilterSubmitUrl = "${baseUrl_test}submit_crm_lead_list_filter"; const crmLeadListFilterSubmitUrl = "${baseUrl_test}submit_crm_lead_list_filter";
const crmLeadListSourceOnReferenceUrl = "${baseUrl_test}get_source_on_reference"; const crmLeadListSourceOnReferenceUrl = "${baseUrl_test}get_source_on_reference";
......
pubspec.lock
View file @ 2ccf19cc
...@@ -37,10 +37,18 @@ packages: ...@@ -37,10 +37,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: async name: async
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.13.0" version: "2.12.0"
auto_size_text:
dependency: "direct main"
description:
name: auto_size_text
sha256: "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599"
url: "https://pub.dev"
source: hosted
version: "3.0.0"
barcode: barcode:
dependency: transitive dependency: transitive
description: description:
...@@ -285,10 +293,10 @@ packages: ...@@ -285,10 +293,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.3" version: "1.3.2"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
...@@ -932,26 +940,26 @@ packages: ...@@ -932,26 +940,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0" sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "11.0.1" version: "10.0.8"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.10" version: "3.0.9"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.2" version: "3.0.1"
lints: lints:
dependency: transitive dependency: transitive
description: description:
...@@ -1657,10 +1665,10 @@ packages: ...@@ -1657,10 +1665,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "15.0.0" version: "14.3.1"
web: web:
dependency: transitive dependency: transitive
description: description:
......
pubspec.yaml
View file @ 2ccf19cc
...@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev ...@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.89+93 version: 1.0.90+94
environment: environment:
sdk: ^3.7.2 sdk: ^3.7.2
...@@ -80,6 +80,7 @@ dependencies: ...@@ -80,6 +80,7 @@ dependencies:
interactive_slider: ^0.5.1 interactive_slider: ^0.5.1
tuple: ^2.0.2 tuple: ^2.0.2
collection: ^1.19.1 collection: ^1.19.1
auto_size_text: ^3.0.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
......
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