update carton filter and merge api for shipment

lib/pages/carton/package_selection_widget.dart

@@ -13,7 +13,6 @@ import '../widgets/continue_button.dart';
 import '../widgets/display_text.dart';
 import '../widgets/local_title.dart';
 import '../widgets/previous_button.dart';
-import 'model/carton_selection_model.dart';
 import 'model/package_selection_model.dart';
 import 'package_selection_result.dart';
 
@@ -63,25 +62,26 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
 
   _init() {
     var searchModel = context.read<PackageSelectionModel>();
+
     searchModel.addDefaultPackages(
         shipmentId: widget.shipment.id!,
         consigneeId: widget.consignee.id!,
         senderId: widget.sender.id!);
 
     searchModel.addSelectedPackage(widget.packages);
-
     _controller.text = searchModel.query;
     _query = searchModel.query;
+
     if (mounted) {
       setState(() {});
     }
   }
 
-  @override
-  void didUpdateWidget(covariant PackageSelectionWidget oldWidget) {
-    _init();
-    super.didUpdateWidget(oldWidget);
-  }
+  // @override
+  // void didUpdateWidget(covariant PackageSelectionWidget oldWidget) {
+  //   _init();
+  //   super.didUpdateWidget(oldWidget);
+  // }
 
   Future<void> _loadMoreData() async {
     if (_isLoadMore) return;
@@ -278,7 +278,7 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
                       isLoadingMore: _isLoadMore,
                       onLoadMore: _loadMoreData,
                       onRefresh: () async {
-                        _init();
+                        _search();
                         setState(() {
                           _down = true;
                         });
@@ -330,9 +330,11 @@ class _PackageSelectionWidgetState extends State<PackageSelectionWidget> {
 
   _search({bool imm = false}) async {
     try {
-      await context
-          .read<CartonSelectionModel>()
-          .search(_query, imm: imm, shipmentId: widget.shipment.id!);
+      await context.read<PackageSelectionModel>().search(_query,
+          imm: imm,
+          shipmentId: widget.shipment.id!,
+          senderId: widget.sender.id!,
+          consigneeId: widget.consignee.id!);
     } catch (e) {
       showMsgDialog(context, 'Error', e.toString());
     }