Commit Dart Version Added

.dart_tool/package_config.json

@@ -45,7 +45,7 @@
     },
     {
       "name": "flutter",
-      "rootUri": "file:///C:/Users/Admin/Downloads/flutter_windows_3.27.1-stable/flutter/packages/flutter",
+      "rootUri": "file:///C:/src/flutter/flutter/packages/flutter",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
@@ -57,7 +57,7 @@
     },
     {
       "name": "flutter_test",
-      "rootUri": "file:///C:/Users/Admin/Downloads/flutter_windows_3.27.1-stable/flutter/packages/flutter_test",
+      "rootUri": "file:///C:/src/flutter/flutter/packages/flutter_test",
       "packageUri": "lib/",
       "languageVersion": "3.3"
     },
@@ -153,7 +153,7 @@
     },
     {
       "name": "sky_engine",
-      "rootUri": "file:///C:/Users/Admin/Downloads/flutter_windows_3.27.1-stable/flutter/bin/cache/pkg/sky_engine",
+      "rootUri": "file:///C:/src/flutter/flutter/bin/cache/pkg/sky_engine",
       "packageUri": "lib/",
       "languageVersion": "3.2"
     },
@@ -181,6 +181,18 @@
       "packageUri": "lib/",
       "languageVersion": "3.1"
     },
+    {
+      "name": "syncfusion_flutter_core",
+      "rootUri": "file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/syncfusion_flutter_core-28.2.3",
+      "packageUri": "lib/",
+      "languageVersion": "3.3"
+    },
+    {
+      "name": "syncfusion_flutter_datepicker",
+      "rootUri": "file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/syncfusion_flutter_datepicker-28.2.3",
+      "packageUri": "lib/",
+      "languageVersion": "3.3"
+    },
     {
       "name": "table_calendar",
       "rootUri": "file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/table_calendar-3.2.0",
@@ -242,10 +254,10 @@
       "languageVersion": "3.6"
     }
   ],
-  "generated": "2025-02-04T05:25:47.560928Z",
+  "generated": "2025-02-04T00:31:13.726347Z",
   "generator": "pub",
-  "generatorVersion": "3.6.0",
+  "generatorVersion": "3.6.1",
-  "flutterRoot": "file:///C:/Users/Admin/Downloads/flutter_windows_3.27.1-stable/flutter",
+  "flutterRoot": "file:///C:/src/flutter/flutter",
-  "flutterVersion": "3.27.1",
+  "flutterVersion": "3.27.3",
   "pubCache": "file:///C:/Users/Admin/AppData/Local/Pub/Cache"
 }

.dart_tool/package_config_subset

@@ -106,6 +106,14 @@ string_scanner
 3.1
 file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.3.0/
 file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.3.0/lib/
+syncfusion_flutter_core
+3.3
+file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/syncfusion_flutter_core-28.2.3/
+file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/syncfusion_flutter_core-28.2.3/lib/
+syncfusion_flutter_datepicker
+3.3
+file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/syncfusion_flutter_datepicker-28.2.3/
+file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/syncfusion_flutter_datepicker-28.2.3/lib/
 table_calendar
 3.0
 file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/table_calendar-3.2.0/
@@ -142,20 +150,20 @@ web
 3.4
 file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/web-1.1.0/
 file:///C:/Users/Admin/AppData/Local/Pub/Cache/hosted/pub.dev/web-1.1.0/lib/
-sky_engine
-3.2
-file:///C:/Users/Admin/Downloads/flutter_windows_3.27.1-stable/flutter/bin/cache/pkg/sky_engine/
-file:///C:/Users/Admin/Downloads/flutter_windows_3.27.1-stable/flutter/bin/cache/pkg/sky_engine/lib/
-flutter
-3.3
-file:///C:/Users/Admin/Downloads/flutter_windows_3.27.1-stable/flutter/packages/flutter/
-file:///C:/Users/Admin/Downloads/flutter_windows_3.27.1-stable/flutter/packages/flutter/lib/
-flutter_test
-3.3
-file:///C:/Users/Admin/Downloads/flutter_windows_3.27.1-stable/flutter/packages/flutter_test/
-file:///C:/Users/Admin/Downloads/flutter_windows_3.27.1-stable/flutter/packages/flutter_test/lib/
 shayog
 3.6
-file:///C:/Users/Admin/Downloads/shayog%205/shayog/
+file:///C:/Users/Admin/Downloads/shayog/
-file:///C:/Users/Admin/Downloads/shayog%205/shayog/lib/
+file:///C:/Users/Admin/Downloads/shayog/lib/
+sky_engine
+3.2
+file:///C:/src/flutter/flutter/bin/cache/pkg/sky_engine/
+file:///C:/src/flutter/flutter/bin/cache/pkg/sky_engine/lib/
+flutter
+3.3
+file:///C:/src/flutter/flutter/packages/flutter/
+file:///C:/src/flutter/flutter/packages/flutter/lib/
+flutter_test
+3.3
+file:///C:/src/flutter/flutter/packages/flutter_test/
+file:///C:/src/flutter/flutter/packages/flutter_test/lib/
 2

.dart_tool/version

@@ -1 +1 @@
-3.27.1
+3.27.3

android/local.properties

@@ -1,5 +1,5 @@
-sdk.dir=C:\\Users\\Admin\\.jdks\\openjdk-23.0.1
+sdk.dir=C:\\Users\\Admin\\AppData\\Local\\Android\\sdk
-flutter.sdk=C:\\Users\\Admin\\Downloads\\flutter_windows_3.27.1-stable\\flutter
+flutter.sdk=C:\\src\\flutter\\flutter
 flutter.buildMode=release
 flutter.versionName=1.0.0
 flutter.versionCode=1

lib/components/common/common_btn.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:shayog/components/styles/app_colors.dart';
 import 'package:shayog/components/styles/textStyles.dart';
 

lib/components/common/common_button.dart

@@ -1,5 +1,4 @@
 
-import 'package:flutter/material.dart';
 
 import 'package:get/get.dart';
 import 'package:shayog/components/styles/textStyles.dart';

lib/components/common/input_field.dart

@@ -14,11 +14,7 @@ class InputField extends StatelessWidget {
       this.onFieldSubmitted,
       this.validator,
       this.edgesInsects,
-<<<<<<< HEAD
-      this.underLineBorder});
-=======
       this.underLineBorder,this.maxLength});
->>>>>>> feature_dev_prativa
 
   String? title;
   OutlineInputBorder? underLineBorder;

lib/feature/presentation/screens/admin/freight_bills/freightbill_screen.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:shayog/components/styles/textStyles.dart';
 

lib/feature/presentation/screens/transporter/view/sub_views/generate_fright_bill.dart

@@ -14,65 +14,11 @@ import '../../../../../../../components/styles/app_strings.dart';
 import '../../view_model/transport_controller.dart';
 import '../../widgets/common_card.dart';
 import '../../widgets/freightbill_dialog.dart';
-import 'package:syncfusion_flutter_datepicker/datepicker.dart';
 
-class GenerateFrightBill extends StatefulWidget {
+class GenerateFrightBill extends StatelessWidget {
   GenerateFrightBill({super.key});
 
-  @override
-  State<GenerateFrightBill> createState() => _GenerateFrightBillState();
-}
-
-class _GenerateFrightBillState extends State<GenerateFrightBill> {
   final controller = Get.put(TransportController());
-  String _selectedDateRange = '';
-
-
-  void _onSelectionChanged(DateRangePickerSelectionChangedArgs args) {
-    final startDate = args.value.startDate;
-    final endDate = args.value.endDate;
-
-    // If a valid range is selected
-    if (startDate != null && endDate != null) {
-      setState(() {
-        _selectedDateRange =
-        'Selected Range: ${startDate.toLocal()} - ${endDate.toLocal()}';
-      });
-
-      // Update the TextFormField with the formatted date range
-      String formattedStartDate =
-      DateFormat('dd/MM/yyyy').format(startDate);
-      String formattedEndDate =
-      DateFormat('dd-MM/yyyy').format(endDate);
-
-      controller.fromController.text = '$formattedStartDate - $formattedEndDate';
-    }
-  }
-
-  // Show the date range picker dialog
-  void _showDateRangePicker() async {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return Dialog(
-          child: Container(
-            height: 350,
-            width: 650,
-            margin: EdgeInsets.all(16),
-            child: SfDateRangePicker(
-              selectionMode: DateRangePickerSelectionMode.range,
-              enableMultiView: true,  // Enable multi-view calendar
-              onSelectionChanged: _onSelectionChanged,
-              headerStyle: DateRangePickerHeaderStyle(
-                textAlign: TextAlign.center,
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-
 
   @override
   Widget build(BuildContext context) {
@@ -175,49 +121,33 @@ class _GenerateFrightBillState extends State<GenerateFrightBill> {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           TextView(text:"MRN Date Range"),
-                          // SizedBox(height: 8),
+
-                          // CustomDropdown<String>(
-                          //   borderClr: AppColors.clrGrey,
-                          //   items: controller.date,
-                          //   itemLabel: (item) => item,
-                          //   onSelected: (selected) {
-                          //     if (selected != null) {
-                          //       controller.selectPlant.value = selected;
-                          //     }
-                          //   },
-                          //   hintText: "Select MRN Date Range",
-                          // ),
                           Container(
                             margin: EdgeInsets.only(top: 8),
                             height: 35,
                             child: TextFormField(
+
                               key: controller.fromTextFieldKey,
                               controller: controller.fromController,
-                              readOnly: true, // Set as readonly so user can't type
+                              onTap: () async {
-                              onTap: () {
+                                final pickedDate = await showWebDatePicker(
-                                _showDateRangePicker();
+                                  width: 20.w,
+                                  context: controller
+                                      .fromTextFieldKey.currentContext!,
+                                  initialDate: controller.fromSelectedDate,
+                                  firstDate: DateTime(2000),
+                                  lastDate: DateTime.now(),
+                                );
+
+                                if (pickedDate != null) {
+                                  controller.fromSelectedDate = pickedDate;
+                                  String formattedDate =
+                                  controller.getFormattedDate(pickedDate);
+                                  controller.fromController.text =
+                                      formattedDate;
+                                  controller.dateCheck.value = true;
+                                }
                               },
-                              // key: controller.fromTextFieldKey,
-                              // controller: controller.fromController,
-                              // onTap: () async {
-                              //   final pickedDate = await showWebDatePicker(
-                              //     width: 20.w,
-                              //     context: controller
-                              //         .fromTextFieldKey.currentContext!,
-                              //     initialDate: controller.fromSelectedDate,
-                              //     firstDate: DateTime(2000),
-                              //     lastDate: DateTime.now(),
-                              //   );
-                              //
-                              //   if (pickedDate != null) {
-                              //     controller.fromSelectedDate = pickedDate;
-                              //     String formattedDate =
-                              //         controller.getFormattedDate(pickedDate);
-                              //     controller.fromController.text =
-                              //         formattedDate;
-                              //     controller.dateCheck.value = true;
-                              //   }
-                              // },
                               decoration: InputDecoration(
                                 fillColor:AppColors.clrD9,
                                 filled: true,
@@ -228,33 +158,33 @@ class _GenerateFrightBillState extends State<GenerateFrightBill> {
                                 border: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(2.0),
                                   borderSide:
-                                      BorderSide(color: AppColors.black),
+                                  BorderSide(color: AppColors.black),
                                 ),
                                 enabledBorder: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(2.0),
                                   borderSide:
-                                      BorderSide(color: AppColors.clrGrey),
+                                  BorderSide(color: AppColors.clrGrey),
                                 ),
                                 focusedBorder: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(2.0),
                                   borderSide:
-                                      BorderSide(color: AppColors.clrGrey),
+                                  BorderSide(color: AppColors.clrGrey),
                                 ),
                                 disabledBorder: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(2.0),
                                   borderSide:
-                                      BorderSide(color: AppColors.clrGrey),
+                                  BorderSide(color: AppColors.clrGrey),
                                 ),
                                 suffixIcon: controller.dateCheck.value
                                     ? InkWell(
-                                        onTap: () {
+                                  onTap: () {
-                                          controller.dateCheck.value = false;
+                                    controller.dateCheck.value = false;
-                                          controller.fromController.clear();
+                                    controller.fromController.clear();
-                                          controller.fromSelectedDate =
+                                    controller.fromSelectedDate =
-                                              DateTime.now();
+                                        DateTime.now();
-                                        },
+                                  },
-                                        child: Icon(Icons.close, size: 1.2.w),
+                                  child: Icon(Icons.close, size: 1.2.w),
-                                      )
+                                )
                                     : null,
                                 contentPadding: const EdgeInsets.symmetric(
                                     horizontal: 12.0, vertical: 0.0),
@@ -291,38 +221,38 @@ class _GenerateFrightBillState extends State<GenerateFrightBill> {
                       width: 16,
                     ),
                     Expanded(
-                        //flex: 2,
+                      //flex: 2,
                         child: Column(
-                      children: [
+                          children: [
-                        TextView(text:
+                            TextView(text:
-                          "",
+                            "",
-                        ),
+                            ),
-                        Padding(
+                            Padding(
-                          padding: const EdgeInsets.only(top: 8.0),
+                              padding: const EdgeInsets.only(top: 8.0),
-                          child: Row(
+                              child: Row(
-                            mainAxisAlignment: MainAxisAlignment.end,
+                                mainAxisAlignment: MainAxisAlignment.end,
-                            children: [
+                                children: [
-                              CommonBtn(
+                                  CommonBtn(
-                                bkClr: Colors.white,
+                                    bkClr: Colors.white,
-                                text: AppStrings.cancel,
+                                    text: AppStrings.cancel,
-                                clickAction: () {},
+                                    clickAction: () {},
-                              ),
+                                  ),
-                              SizedBox(width: 16),
+                                  SizedBox(width: 16),
-                              CommonButton(
+                                  CommonButton(
-                                borderRadius: 4,
+                                    borderRadius: 4,
-                                height: 30,
+                                    height: 30,
-                                width: 100,
+                                    width: 100,
-                                text: AppStrings.submit,
+                                    text: AppStrings.submit,
 
-                                clickAction: () {
+                                    clickAction: () {
-                                  controller.postData();
+                                      controller.postData();
-                                },
+                                    },
+                                  ),
+                                ],
                               ),
-                            ],
+                            ),
-                          ),
+                          ],
-                        ),
+                        ))
-                      ],
-                    ))
                   ],
                 ),
               ),
@@ -339,12 +269,12 @@ class _GenerateFrightBillState extends State<GenerateFrightBill> {
               TextView(text: AppStrings.viewGrnDetails, style: 14.txtBoldWhite),
               Spacer(),
               CommonBtn(
-                width: 150,
+                  width: 150,
                   bkClr: AppColors.white,
                   borderClr: AppColors.primaryClr,
                   style: 12.txtBoldBlue,
-                text: "Generate Freight Bill",
+                  text: "Generate Freight Bill",
-                //  text: AppStrings.save,
+                  //  text: AppStrings.save,
                   clickAction: () {
                     bool hasSelectedRows = controller.grnDetails
                         .any((element) => element.isSelected);
@@ -446,60 +376,60 @@ class _GenerateFrightBillState extends State<GenerateFrightBill> {
                         dataColumn(AppStrings.freightAmount),
                       ],
                       rows: List<DataRow>.generate(controller.grnDetails.length,
-                          (index) {
+                              (index) {
-                        final stoppage = controller.grnDetails[index];
+                            final stoppage = controller.grnDetails[index];
 
-                        return DataRow(
+                            return DataRow(
-                          selected: stoppage.isSelected,
+                              selected: stoppage.isSelected,
-                          cells: [
+                              cells: [
-                            DataCell(
+                                DataCell(
-                              Transform.scale(
+                                  Transform.scale(
-                                scale: 0.80,
+                                    scale: 0.80,
-                                child: Checkbox(
+                                    child: Checkbox(
-                                  value: stoppage.isSelected,
+                                      value: stoppage.isSelected,
-                                  onChanged: (value) {
+                                      onChanged: (value) {
-                                    controller.toggleSelection(
+                                        controller.toggleSelection(
-                                        index, value ?? false);
+                                            index, value ?? false);
-                                  },
+                                      },
-                                  activeColor: AppColors.primaryClr,
+                                      activeColor: AppColors.primaryClr,
-                                  // Custom color when selected
+                                      // Custom color when selected
-                                  checkColor: Colors.white,
+                                      checkColor: Colors.white,
-                                  // Custom color for check mark
+                                      // Custom color for check mark
-                                  materialTapTargetSize: MaterialTapTargetSize
+                                      materialTapTargetSize: MaterialTapTargetSize
-                                      .shrinkWrap, // Avoids large tap area
+                                          .shrinkWrap, // Avoids large tap area
+                                    ),
+                                  ),
                                 ),
-                              ),
+                                // editableCell(index, "0${index + 1}"),
-                            ),
+                                editableCell(index, stoppage.grnNo ?? ""),
-                           // editableCell(index, "0${index + 1}"),
+                                editableCell(index, stoppage.plantCode ?? ""),
-                            editableCell(index, stoppage.grnNo ?? ""),
+                                editableCell(index, stoppage.materialCode ?? ""),
-                            editableCell(index, stoppage.plantCode ?? ""),
+                                editableCell(
-                            editableCell(index, stoppage.materialCode ?? ""),
+                                    index,
-                            editableCell(
+                                    DateFormat('yyyy-MM-dd').format(
-                                index,
+                                        stoppage.grnDate ?? DateTime.now())),
-                                DateFormat('dd/MM/yyyy').format(
+                                editableCell(index, stoppage.fromLocation ?? ""),
-                                    stoppage.grnDate ?? DateTime.now())),
+                                editableCell(index, stoppage.vehicleNo ?? ""),
-                            editableCell(index, stoppage.fromLocation ?? ""),
+                                editableCell(index, stoppage.lrNo ?? ""),
-                            editableCell(index, stoppage.vehicleNo ?? ""),
+                                editableCell(
-                            editableCell(index, stoppage.lrNo ?? ""),
+                                    index,
-                            editableCell(
+                                    DateFormat('yyyy-MM-dd')
-                                index,
+                                        .format(stoppage.lrDate ?? DateTime.now())),
-                                DateFormat('dd/MM/yyyy')
+                                editableCell(
-                                    .format(stoppage.lrDate ?? DateTime.now())),
+                                    index, stoppage.dispQty?.toString() ?? ""),
-                            editableCell(
+                                editableCell(
-                                index, stoppage.dispQty?.toString() ?? ""),
+                                    index, stoppage.netQty?.toString() ?? ""),
-                            editableCell(
+                                editableCell(
-                                index, stoppage.netQty?.toString() ?? ""),
+                                    index, stoppage.billingQty?.toString() ?? ""),
-                            editableCell(
+                                editableCell(
-                                index, stoppage.billingQty?.toString() ?? ""),
+                                    index, stoppage.freightRate?.toString() ?? ""),
-                            editableCell(
+                                editableCell(
-                                index, stoppage.freightRate?.toString() ?? ""),
+                                    index, stoppage.shipmentCost?.toString() ?? ""),
-                            editableCell(
+                                editableCell(
-                                index, stoppage.shipmentCost?.toString() ?? ""),
+                                    index, stoppage.statusId?.toString() ?? ""),
-                            editableCell(
+                              ],
-                                index, stoppage.statusId?.toString() ?? ""),
+                            );
-                          ],
+                          }),
-                        );
-                      }),
                     ),
                   ),
                 ),
@@ -510,4 +440,6 @@ class _GenerateFrightBillState extends State<GenerateFrightBill> {
       ],
     );
   }
+
+
 }

lib/feature/presentation/screens/transporter/view/sub_views/view_freight_bill.dart

@@ -41,11 +41,7 @@ class ViewFreightBill extends StatelessWidget {
                       mainAxisAlignment: MainAxisAlignment.start,
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-<<<<<<< HEAD
                         TextView(text: "Plant",isRequired: true,),
-=======
-                        TextView(text: "Plant"),
->>>>>>> feature_dev_prativa
                         SizedBox(height: 8),
                         CustomDropdown(
                           backClr: AppColors.clrD9,
@@ -72,11 +68,7 @@ class ViewFreightBill extends StatelessWidget {
                       mainAxisAlignment: MainAxisAlignment.start,
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-<<<<<<< HEAD
                         TextView(text: "Product Name",isRequired: true,),
-=======
-                        TextView(text: "Product Name"),
->>>>>>> feature_dev_prativa
                         SizedBox(height: 8),
                         CustomDropdown<dynamic>(
                           width: 250,
@@ -103,11 +95,7 @@ class ViewFreightBill extends StatelessWidget {
                       mainAxisAlignment: MainAxisAlignment.start,
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-<<<<<<< HEAD
                         TextView(text: "Transaction Type",isRequired: true,),
-=======
-                        TextView(text: "Transaction Type"),
->>>>>>> feature_dev_prativa
                         SizedBox(height: 8),
                         CustomDropdown<String>(
                           backClr: AppColors.clrD9,
@@ -137,11 +125,7 @@ class ViewFreightBill extends StatelessWidget {
                         mainAxisAlignment: MainAxisAlignment.start,
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-<<<<<<< HEAD
                           TextView(text: "MRN Date Range",isRequired: true,),
-=======
-                          TextView(text: "MRN Date Range"),
->>>>>>> feature_dev_prativa
                           Container(
                             margin: EdgeInsets.only(top: 8),
                             height: 35,
@@ -219,11 +203,7 @@ class ViewFreightBill extends StatelessWidget {
                         mainAxisAlignment: MainAxisAlignment.start,
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-<<<<<<< HEAD
                           TextView(text: "From Location",isRequired: true,),
-=======
-                          TextView(text: "From Location"),
->>>>>>> feature_dev_prativa
                           SizedBox(height: 8),
                           CustomDropdown<dynamic>(
                             backClr: AppColors.clrD9,
@@ -367,11 +347,6 @@ class ViewFreightBill extends StatelessWidget {
                               top: BorderSide(color: AppColors.clrGrey),
                             ),
                             columns: [
-<<<<<<< HEAD
-                              dataColumn(AppStrings.srNo),
-=======
-
->>>>>>> feature_dev_prativa
                               dataColumn(AppStrings.plant),
                               dataColumn(
                                 AppStrings.productName,
@@ -420,11 +395,7 @@ class ViewFreightBill extends StatelessWidget {
                                   controller.freightBillData[index];
                               return DataRow(
                                 cells: [
-<<<<<<< HEAD
                                   editableCell(index, "0${index + 1}"),
-=======
-
->>>>>>> feature_dev_prativa
                                   editableCell(
                                       index, "${freightBill.plantCode}"),
                                   editableCell(index, "${freightBill.status}"),

lib/feature/presentation/screens/transporter/view_model/transport_controller.dart

@@ -27,16 +27,13 @@ class TransportController extends GetxController {
   var freightBill = [].obs;
   var fromLocation = [].obs;
   var grnList = [].obs;
-<<<<<<< HEAD
   final GlobalKey<FormState> formKey = GlobalKey<FormState>();
 
   RxBool selectAllField = false.obs;
 RxBool plantValidate = false.obs;
 RxBool transValidate = false.obs;
-=======
   RxBool selectAllField = false.obs;
 
->>>>>>> feature_dev_prativa
   void toggleSelection(int index, bool? value) {
     grnDetails[index].isSelected = value!;
     grnDetails.refresh();
@@ -128,7 +125,6 @@ RxBool transValidate = false.obs;
     }
   }
 
-<<<<<<< HEAD
 
   bool isEmbeddedProduct(String materialCode) {
     List<Prodect> embeddedProducts = product;
@@ -137,8 +133,6 @@ RxBool transValidate = false.obs;
   }
 
 
-=======
->>>>>>> feature_dev_prativa
   final fromTextFieldKey = GlobalKey();
   TextEditingController fromController = TextEditingController();
   DateTime fromSelectedDate = DateTime.now(); // Initialize with a default value

lib/feature/presentation/widgets/custom_pagination.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:shayog/components/styles/textStyles.dart';
 import 'dart:math' as math;
 import '../../../components/styles/app_colors.dart';

lib/services/network/ApiUrls.dart

@@ -1,18 +1,14 @@
 class ApiUrls {
   ApiUrls._();
 
-<<<<<<< HEAD
   static const String baseUrl = "http://46.28.44.130:9092/";
-=======
+  // static const String baseUrl = "http://localhost:9092/";
-  static const String baseUrl = "http://localhost:9092/";
->>>>>>> feature_dev_prativa
   static const String baseUrlImage =
       "https://codingacademy.world/early_eyes/public/images/user/";
   static const addFreightBill =
       'bill/grndetails?page=0&size=20&sort=grn_date,desc';
   static const getFreightBills = 'bill/dropdown';
   static const generateFreightBill =
-<<<<<<< HEAD
       'http://46.28.44.130:9092/bill/addFreightBill';
   static const createUser = 'http://46.28.44.130:9093/api/users/createUser';
   static const editUser =
@@ -40,7 +36,6 @@ class ApiUrls {
   static const userTypeDetails =
       "http://46.28.44.130:9093/api/user-types/usertypedetails?page=0&size=15&sort=last_updated_on,desc";
   static const grnPendingDetails = "http://46.28.44.130:9092/bill/grndetailsPanding?page=0&size=20&sort=grn_date,desc";
-=======
       'http://localhost:9092/bill/addFreightBill';
   static const createUser = 'http://localhost:9093/api/users/createUser';
   static const editUser =
@@ -68,5 +63,4 @@ class ApiUrls {
   static const userTypeDetails =
       "http://localhost:9093/api/user-types/usertypedetails?page=0&size=15&sort=last_updated_on,desc";
   static const grnPendingDetails = "http://localhost:9092/bill/grndetailsPanding?page=0&size=20&sort=grn_date,desc";
->>>>>>> feature_dev_prativa
 }

lib/services/network/remote_services.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 import 'package:shayog/services/prefrences/prefrences.dart';
@@ -23,8 +22,6 @@ class RemoteService {
     //   headers.addAll({"Authorization": "Bearer$bearerToken"});}
     return headers;
   }
-
-<<<<<<< HEAD
   static Future<Map<String, String>> getHeadersFileUpload() async {
     // String? bearerToken = Preferences.getPref(Preferences.authToken) as String?;
     Map<String, String> headers = {
@@ -37,7 +34,6 @@ class RemoteService {
     // }
     return headers;
   }
-=======
   // static Future<Map<String, String>> getHeadersFileUpload() async {
   //   String? bearerToken = Preferences.getPref(Preferences.authToken) as String?;
   //   Map<String, String> headers = {
@@ -50,7 +46,6 @@ class RemoteService {
   //   }
   //   return headers;
   // }
->>>>>>> feature_dev_prativa
 
   static Future<CommonResModel?> simplePost(
       Map<String, dynamic> requestBody, String endUrl) async {
@@ -180,7 +175,6 @@ class RemoteService {
     }
   }
 
-<<<<<<< HEAD
   static Future<CommonResModel?> uploadPhotosPost(
       List<String> paths, String endUrl) async {
     // var isConnected = await InternetConnection.isConnected();
@@ -212,7 +206,6 @@ class RemoteService {
       return null;
     }
   }
-=======
   // static Future<CommonResModel?> uploadPhotosPost(
   //     List<String> paths, String endUrl) async {
   //   // var isConnected = await InternetConnection.isConnected();
@@ -244,8 +237,6 @@ class RemoteService {
   //     return null;
   //   }
   // }
->>>>>>> feature_dev_prativa
-
   static Future<CommonResModel?> simpleDelete(String endUrl) async {
     final response =
         await http.delete(Uri.parse(_baseUrl + endUrl), headers: getHeaders());
@@ -311,13 +302,10 @@ class RemoteService {
 
       try {
         final map = jsonDecode(response.body) as Map<String, dynamic>;
-<<<<<<< HEAD
         AppAlerts.alert(message: '${map['message']}');
         print("'${map['message']}'");
-=======
         // AppAlerts.alert(message: '${map['message']}');
         // print("'${map['message']}'");
->>>>>>> feature_dev_prativa
 
         throw map['message'];
       } catch (e) {

lib/services/prefrences/prefrences.dart

@@ -2,10 +2,8 @@
 //
 //
 //
-<<<<<<< HEAD
+
 // import 'package:shared_preferences/shared_preferences.dart';
-=======
->>>>>>> feature_dev_prativa
 //
 // class Preferences {
 //
@@ -18,21 +16,19 @@
 //   static const prefKeyParent = 'pref_key_parent';
 //   static const userRoleKey = 'pref_key_user_role';
 //
-<<<<<<< HEAD
+
 //   // static late SharedPreferences _prefs;
 //
 //   // static Future createInstance() async {
 //   //   _prefs = await SharedPreferences.getInstance();
 //   //   return;
 //   // }
-=======
 //   static late SharedPreferences _prefs;
 //
 //   static Future createInstance() async {
 //     _prefs = await SharedPreferences.getInstance();
 //     return;
 //   }
->>>>>>> feature_dev_prativa
 //
 //
 //   static void removeUserData(){

lib/utils/extensions.dart

@@ -1,5 +1,4 @@
 
-import 'package:flutter/material.dart';
 
 
 

pubspec.lock

@@ -321,9 +321,5 @@ packages:
     source: hosted
     version: "1.1.0"
 sdks:
-<<<<<<< HEAD
-  dart: ">=3.6.0 <4.0.0"
-=======
   dart: ">=3.6.1 <4.0.0"
->>>>>>> feature_dev_prativa
   flutter: ">=3.18.0-18.0.pre.54"

pubspec.yaml

@@ -19,11 +19,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-<<<<<<< HEAD
+
-  sdk: ^3.6.0
-=======
   sdk: ^3.6.1
->>>>>>> feature_dev_prativa
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions