08-08-2025 By Sai Srinivas

Order Module

lib/screens/order/paymentListsByMode.dart

@@ -159,9 +159,10 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
     return (connection == "Online")
         ? Platform.isAndroid
         ? WillPopScope(
-      onWillPop: () {
-        Provider.of<Paymentsprovider>(context).resetAll();
-        return onBackPressed(context);
+      onWillPop: () async {
+        Provider.of<Paymentsprovider>(context,listen: false).resetAll();
+        Navigator.pop(context,true);
+        return true;
       },
       child: SafeArea(
         top: false,
@@ -175,30 +176,11 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
 
 
   Widget _scaffold(BuildContext context) {
-    switch (_source.keys.toList()[0]) {
-      case ConnectivityResult.mobile:
-        connection = 'Online';
-        break;
-      case ConnectivityResult.wifi:
-        connection = 'Online';
-        break;
-      case ConnectivityResult.none:
-      default:
-        connection = 'Offline';
-    }
-    return
-    Consumer<Paymentsprovider>(
+
+    return Consumer<Paymentsprovider>(
       builder: (context, provider, child) {
         final paymentLists = provider.paymentsList;
-        return WillPopScope(
-          onWillPop: () {
-            provider.resetAll();
-            return onBackPressed(context);
-          },
-          child: SafeArea(
-            top: false,
-            bottom: Platform.isIOS?false:true,
-            child: Scaffold(
+        return Scaffold(
           resizeToAvoidBottomInset: true,
           appBar: appbar2New(
             context,
@@ -388,8 +370,6 @@ class _PaymentlistsbymodeState extends State<Paymentlistsbymode> {
               ],
             ),
           ) : Emptywidget(context),
-            ),
-          ),
         );
       },
     );

lib/services/api_calling.dart

@@ -15,6 +15,7 @@ import 'package:generp/Models/crmModels/LeadListContactPopUpResponse.dart';
 import 'package:generp/Models/crmModels/LeadListViewResponse.dart';
 import 'package:generp/Models/crmModels/ProspectListViewResponse.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/crmLeadDetailsGenerateQuotationSubmitResponse.dart';
 import 'package:generp/Models/crmModels/crmNewLeadsProspectsSubmitResponse.dart';
@@ -66,6 +67,7 @@ import '../Models/ViewVisitDetailsResponse.dart';
 import '../Models/commonModels/commonAddAccountsSubmitResponse.dart';
 import '../Models/crmModels/appointmentCalendarResponse.dart';
 import '../Models/crmModels/crmAddFollowUpResponse.dart';
+import '../Models/crmModels/crmDashboardFollowUpResponse.dart';
 import '../Models/crmModels/crmDashboardResponse.dart';
 import '../Models/crmModels/crmPendingTasksResponse.dart';
 import '../Models/crmModels/crmSelectedProductDetailsResponse.dart';
@@ -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(
     empId,
     session,
@@ -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(
   //     empId,
   //     session,

lib/services/api_names.dart

@@ -118,6 +118,8 @@ const ordersPaymentListByModeUrl = "${baseUrl_test}crm_payments_list_filter_subm
 const ordersPaymentListDeleteUrl = "${baseUrl_test}delete_crm_order_payment";
 const ordersPaymentListApproveRejectUrl = "${baseUrl_test}crm_approve_reject_payment";
 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 ordersTPCAgentListUrl = "${baseUrl_test}tpc_agent_list";
 const ordersTPCAgentDetailsUrl = "${baseUrl_test}tpc_agent_details";
@@ -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 crmNewProspectListEditGstUrl = "${baseUrl_test}crm_prospect_list_edit_gst";
 const crmNearbyOpenLeadsUrl = "${baseUrl_test}nearby_crm_open_leads";
+const crmDashboardFollowUpUrl = "${baseUrl_test}crm_dashboard_followup_list";
+const crmDashboardQuotationsUrl = "${baseUrl_test}crm_dashboard_quotations_list";