update pickup

2021-10-09 17:08:28 +06:30
parent 46da87dc0e
commit 50901992d7
21 changed files with 597 additions and 274 deletions
--- a/lib/pages/pickup/model/pickup_model.dart
+++ b/lib/pages/pickup/model/pickup_model.dart
@@ -1,13 +1,10 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:math';

 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:fcs/data/services/services.dart';
 import 'package:fcs/domain/constants.dart';
-import 'package:fcs/domain/entities/package.dart';
 import 'package:fcs/domain/entities/pickup.dart';
-import 'package:fcs/domain/entities/processing.dart';
 import 'package:fcs/helpers/firebase_helper.dart';
 import 'package:fcs/pages/main/model/base_model.dart';
 import 'package:fcs/pagination/paginator_listener.dart';
@@ -17,22 +14,7 @@ import 'package:path/path.dart' as Path;
 class PickupModel extends BaseModel {
  final log = Logger('PickupModel');

-  StreamSubscription<QuerySnapshot>? listener;
-
-  PaginatorListener<Package>? pickups;
-
-  int _menuSelectedIndex = 1;
-
-  set menuSelectedIndex(int index) {
-    _menuSelectedIndex = index;
-
-    // _loadPackages(_menuSelectedIndex == 2);
-    // _loadCustomerPackages(_menuSelectedIndex == 2);
-
-    notifyListeners();
-  }
-
-  int get menuSelectedIndex => _menuSelectedIndex;
+  PaginatorListener<Pickup>? pickups;

  void initUser(user) {
    super.initUser(user);
@@ -44,13 +26,34 @@ class PickupModel extends BaseModel {
    }
  }

-  Future<void> _initData() async {}
+  Future<void> _initData() async {
+    logout();
+    pickups = PaginatorListener<Pickup>((data, id) => Pickup.fromMap(data, id),
+        onChange: () {
+      notifyListeners();
+    }, rowPerLoad: 30, insertNewByListener: true);
+    _loadPickups();
+  }

  @override
  logout() async {
-    if (listener != null) await listener!.cancel();
    if (pickups != null) pickups!.close();
-    // pickups = [];
+  }
+
+  Future<void> _loadPickups() async {
+    if (user == null) return;
+    String path = "/$pickup_collection";
+
+    try {
+      Query listenerQuery = FirebaseFirestore.instance.collection(path);
+      Query pageQuery = FirebaseFirestore.instance
+          .collection(path)
+          .orderBy("update_time", descending: true);
+
+      pickups!.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
+    } catch (e) {
+      log.warning("Error!! $e");
+    }
  }

  Future<void> complete(
@@ -82,4 +85,27 @@ class PickupModel extends BaseModel {
    }
    return deleteStorageFromUrls(deletedUrls);
  }
+
+  Future<Pickup?> getPickup(String id) async {
+    if (user == null) return null;
+    String path = "/$pickup_collection";
+    try {
+      DocumentSnapshot snap =
+          await FirebaseFirestore.instance.collection("$path").doc(id).get();
+      if (snap.exists) {
+        var package =
+            Pickup.fromMap(snap.data() as Map<String, dynamic>, snap.id);
+        return package;
+      }
+    } catch (e) {
+      log.warning("Error!! $e");
+    }
+    return null;
+  }
+
+  Future<List<Pickup>> searchPickup(String term) async {
+    Future<List<Pickup>> pickups =
+        Services.instance.pickupService.searchPickup(term);
+    return pickups;
+  }
 }
--- a/lib/pages/pickup/pickup_editor.dart
+++ b/lib/pages/pickup/pickup_editor.dart
@@ -1,15 +1,15 @@
 import 'package:fcs/domain/entities/market.dart';
 import 'package:fcs/domain/entities/package.dart';
+import 'package:fcs/domain/entities/pickup.dart';
 import 'package:fcs/domain/entities/user.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/market/market_editor.dart';
 import 'package:fcs/pages/market/model/market_model.dart';
-import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package/tracking_id_page.dart';
 import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/user_search/user_serach.dart';
+import 'package:fcs/pages/pickup/model/pickup_model.dart';
+import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
-import 'package:fcs/pages/widgets/fcs_id_icon.dart';
 import 'package:fcs/pages/widgets/input_text.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/multi_img_controller.dart';
@@ -22,49 +22,56 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';

 class PickupEditor extends StatefulWidget {
-  final Package? package;
-  PickupEditor({this.package});
+  final Pickup? pickup;
+
+  const PickupEditor({Key? key, this.pickup}) : super(key: key);

  @override
  _PickupEditorState createState() => _PickupEditorState();
 }

 class _PickupEditorState extends State<PickupEditor> {
-  TextEditingController _remarkCtl = new TextEditingController();
-  TextEditingController _descCtl = new TextEditingController();
+  var dateFormatter = new DateFormat('dd MMM yyyy');
+  var timeFormatter = new DateFormat('h:mm a');

-  Package? _package;
-  User? _user;
+  TextEditingController _remarkCtl = new TextEditingController();
+  MultiImgController multiImgController = MultiImgController();
+
+  Pickup? _pickup;
  bool _isLoading = false;

  @override
  void initState() {
    super.initState();
-    _package = widget.package;
-    selectedMarket = _package!.market ?? "";
-    _descCtl.text = _package!.desc ?? "";
-    _remarkCtl.text = _package!.remark ?? "";
-    multiImgController.setImageUrls = _package!.photoUrls;
-    _user = User(
-        fcsID: _package!.fcsID ?? "",
-        name: _package!.userName ?? "",
-        phoneNumber: _package!.phoneNumber ?? "");
+    _pickup = widget.pickup;
+    multiImgController.setImageUrls = _pickup!.photoUrls;
  }

-  final DateFormat dateFormat = DateFormat("d MMM yyyy");
-
-  bool isNew = false;
-  MultiImgController multiImgController = MultiImgController();
-
  @override
  Widget build(BuildContext context) {
+    final pickupNumberBox = DisplayText(
+      text: _pickup!.pickupNumber ?? "",
+      labelTextKey: "pickup.pickup_number",
+      iconData: SimpleLineIcons.direction,
+    );
+
+    final pickupDateBox = DisplayText(
+      text: _pickup!.pickupDate == null
+          ? ""
+          : dateFormatter.format(_pickup!.pickupDate!),
+      labelTextKey: "pickup.date",
+      iconData: Icons.date_range,
+    );
+
    var timeBox = Row(
      mainAxisAlignment: MainAxisAlignment.spaceBetween,
      children: <Widget>[
        Container(
          width: 150,
          child: DisplayText(
-            text: '9:00 AM',
+            text: _pickup!.fromTime == null
+                ? ""
+                : timeFormatter.format(_pickup!.fromTime!),
            labelTextKey: "pickup.from_time",
            iconData: MaterialCommunityIcons.clock_start,
          ),
@@ -72,42 +79,46 @@ class _PickupEditorState extends State<PickupEditor> {
        Container(
          width: 150,
          child: DisplayText(
-              text: '12:00 AM',
-              labelTextKey: "pickup.to_time",
-              iconData: MaterialCommunityIcons.clock_end),
+            text: _pickup!.toTime == null
+                ? ""
+                : timeFormatter.format(_pickup!.toTime!),
+            labelTextKey: "pickup.to_time",
+            iconData: MaterialCommunityIcons.clock_end,
+          ),
        )
      ],
    );

-    final pickupDateBox = DisplayText(
-      text: "12-05-2021",
-      labelTextKey: "pickup.date",
-      iconData: Icons.date_range,
+    final customerBox = DisplayText(
+      text: _pickup!.customerName ?? "",
+      labelTextKey: "pickup.customer",
+      iconData: Icons.perm_identity,
    );

-    final pickupNumberBox = DisplayText(
-      text: "210502-ASDFRE",
-      labelTextKey: "pickup.pickup_number",
-      iconData: SimpleLineIcons.direction,
+    final staffNameBox = DisplayText(
+      text: _pickup!.staffName ?? "",
+      labelTextKey: "pickup.staff.name",
+      iconData: Icons.perm_identity,
    );
+
+    final deliveryAddressBox = DefaultDeliveryAddress(
+        deliveryAddress: _pickup!.pickupAddress,
+        labelKey: "pickup.delivery.address",
+        onTap: null);
+
    final completeProcessingBtn = fcsButton(
      context,
      getLocalString(context, 'pickup.edit.complete.btn'),
      callack: _confirmComplete,
    );

-    final staffNameBox = DisplayText(
-      text: _package != null ? _package!.userName : "",
-      labelTextKey: "pickup.staff.name",
-      iconData: Icons.perm_identity,
-    );
-    final remarkBox = InputText(
-        labelTextKey: 'pickup.remark',
+    final completeRemarkBox = InputText(
+        labelTextKey: 'pickup.complete.remark',
        iconData: Entypo.new_message,
        controller: _remarkCtl);

    final statusBox = DisplayText(
-      text: _package != null ? _package!.status : "",
+      text: _pickup != null ? _pickup!.status : "",
      labelTextKey: "pickup.status",
      iconData: Icons.av_timer,
    );
@@ -117,6 +128,7 @@ class _PickupEditorState extends State<PickupEditor> {
      controller: multiImgController,
      title: "Receipt File",
    );
+
    return LocalProgress(
      inAsyncCall: _isLoading,
      child: Scaffold(
@@ -150,11 +162,13 @@ class _PickupEditorState extends State<PickupEditor> {
              pickupNumberBox,
              pickupDateBox,
              timeBox,
+              customerBox,
              staffNameBox,
              statusBox,
-              remarkBox,
+              deliveryAddressBox,
+              completeRemarkBox,
              img,
-              _package!.status == 'packed'
+              _pickup!.status == "confirmed" || _pickup!.status == "rescheduled"
                  ? completeProcessingBtn
                  : Container(),
              SizedBox(
@@ -244,22 +258,15 @@ class _PickupEditorState extends State<PickupEditor> {
  }

  _completePickup() async {
-    if (_user!.fcsID == null || _user!.fcsID == "") {
-      showMsgDialog(context, "Error", "Expected FCS-ID");
-      return;
-    }
    setState(() {
      _isLoading = true;
    });
-    PackageModel packageModel =
-        Provider.of<PackageModel>(context, listen: false);
+
    try {
-      // _package!.fcsID = _user!.fcsID;
-      // _package!.desc = _descCtl.text;
-      // _package!.remark = _remarkCtl.text;
-      // _package!.market = selectedMarket!;
-      // await packageModel.updateProcessing(_package!,
-      //     multiImgController.getAddedFile, multiImgController.getDeletedUrl);
+      _pickup?.completeRemark = _remarkCtl.text;
+      await context.read<PickupModel>().complete(_pickup!,
+          multiImgController.getAddedFile, multiImgController.getDeletedUrl);
+
      Navigator.pop(context);
    } catch (e) {
      showMsgDialog(context, "Error", e.toString());
@@ -277,23 +284,10 @@ class _PickupEditorState extends State<PickupEditor> {
  }

  isDataChanged() {
-    if (isNew) {
-      return _user!.fcsID != "" ||
-          selectedMarket != null ||
-          _descCtl.text != "" ||
-          _remarkCtl.text != "" ||
-          multiImgController.getAddedFile.isNotEmpty;
-    } else {
-      var _package = Package(
-          trackingID: widget.package!.trackingID,
-          fcsID: _user!.fcsID,
-          market: selectedMarket!,
-          desc: _descCtl.text,
-          remark: _remarkCtl.text,
-          photoUrls: widget.package!.photoUrls);
-      return widget.package!.isChangedForEditProcessing(_package) ||
-          multiImgController.getAddedFile.isNotEmpty ||
-          multiImgController.getDeletedUrl.isNotEmpty;
-    }
+    var _pickup = Pickup(
+        completeRemark: _remarkCtl.text, photoUrls: widget.pickup!.photoUrls);
+    return widget.pickup!.isChangedForEdit(_pickup) ||
+        multiImgController.getAddedFile.isNotEmpty ||
+        multiImgController.getDeletedUrl.isNotEmpty;
  }
 }
--- a/lib/pages/pickup/pickup_info.dart
+++ b/lib/pages/pickup/pickup_info.dart
@@ -1,15 +1,14 @@
-import 'package:fcs/domain/entities/package.dart';
+import 'package:fcs/domain/entities/pickup.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/package/model/package_model.dart';
+import 'package:fcs/pages/pickup/model/pickup_model.dart';
 import 'package:fcs/pages/pickup/pickup_editor.dart';
+import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
-import 'package:fcs/pages/widgets/fcs_id_icon.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/multi_img_controller.dart';
 import 'package:fcs/pages/widgets/multi_img_file.dart';
 import 'package:fcs/pages/widgets/progress.dart';
-import 'package:fcs/pages/widgets/status_tree.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_vector_icons/flutter_vector_icons.dart';
@@ -19,8 +18,8 @@ import 'package:provider/provider.dart';
 final DateFormat dateFormat = DateFormat("d MMM yyyy");

 class PickupInfo extends StatefulWidget {
-  final Package? package;
-  PickupInfo({this.package});
+  final Pickup pickup;
+  const PickupInfo({Key? key, required this.pickup}) : super(key: key);

  @override
  _PickupInfoState createState() => _PickupInfoState();
@@ -28,21 +27,22 @@ class PickupInfo extends StatefulWidget {

 class _PickupInfoState extends State<PickupInfo> {
  var dateFormatter = new DateFormat('dd MMM yyyy');
-  Package? _package;
+  var timeFormatter = new DateFormat('h:mm a');
+
+  Pickup? _pickup;
  bool _isLoading = false;
  MultiImgController multiImgController = MultiImgController();

  @override
  void initState() {
    super.initState();
-    initPackage(widget.package!);
+    initPackage(widget.pickup);
  }

-  initPackage(Package? package) {
-    if (package == null) return;
+  initPackage(Pickup pickup) {
    setState(() {
-      _package = package;
-      multiImgController.setImageUrls = package.photoUrls;
+      _pickup = pickup;
+      multiImgController.setImageUrls = pickup.photoUrls;
    });
  }

@@ -54,25 +54,64 @@ class _PickupInfoState extends State<PickupInfo> {
  @override
  Widget build(BuildContext context) {
    final pickupNumberBox = DisplayText(
-      text: _package != null ? '210502-ASDFRE' : '210502-ASDFRE',
+      text: _pickup!.pickupNumber ?? "",
      labelTextKey: "pickup.pickup_number",
      iconData: SimpleLineIcons.direction,
    );

+    final pickupDateBox = DisplayText(
+      text: _pickup!.pickupDate == null
+          ? ""
+          : dateFormatter.format(_pickup!.pickupDate!),
+      labelTextKey: "pickup.date",
+      iconData: Icons.date_range,
+    );
+
+    var timeBox = Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: <Widget>[
+        Container(
+          width: 150,
+          child: DisplayText(
+            text: _pickup!.fromTime == null
+                ? ""
+                : timeFormatter.format(_pickup!.fromTime!),
+            labelTextKey: "pickup.from_time",
+            iconData: MaterialCommunityIcons.clock_start,
+          ),
+        ),
+        Container(
+          width: 150,
+          child: DisplayText(
+            text: _pickup!.toTime == null
+                ? ""
+                : timeFormatter.format(_pickup!.toTime!),
+            labelTextKey: "pickup.to_time",
+            iconData: MaterialCommunityIcons.clock_end,
+          ),
+        )
+      ],
+    );
+
+    final customerBox = DisplayText(
+      text: _pickup!.customerName ?? "",
+      labelTextKey: "pickup.customer",
+      iconData: Icons.perm_identity,
+    );
+
    final staffNameBox = DisplayText(
-      text: _package != null ? _package!.userName : "",
+      text: _pickup!.staffName ?? "",
      labelTextKey: "pickup.staff.name",
      iconData: Icons.perm_identity,
    );

-    final remarkBox = DisplayText(
-      text: _package != null ? _package!.remark : "-",
-      labelTextKey: "pickup.remark",
-      iconData: Entypo.new_message,
-    );
+    final deliveryAddressBox = DefaultDeliveryAddress(
+        deliveryAddress: _pickup!.pickupAddress,
+        labelKey: "pickup.delivery.address",
+        onTap: null);

    final statusBox = DisplayText(
-      text: _package != null ? _package!.status : "",
+      text: _pickup != null ? _pickup!.status : "",
      labelTextKey: "pickup.status",
      iconData: Icons.av_timer,
    );
@@ -83,26 +122,22 @@ class _PickupInfoState extends State<PickupInfo> {
      title: "Receipt File",
    );

-    var timeBox = Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children: <Widget>[
-        Container(
-          width: 150,
-          child: DisplayText(
-            text: '9:00 AM',
-            labelTextKey: "pickup.from_time",
-            iconData: MaterialCommunityIcons.clock_start,
-          ),
-        ),
-        Container(
-          width: 150,
-          child: DisplayText(
-            text: '12:00 AM',
-            labelTextKey: "pickup.to_time",
-            iconData: MaterialCommunityIcons.clock_end,
-          ),
-        )
-      ],
+    final completeRemarkBox = DisplayText(
+      text: _pickup!.completeRemark ?? "",
+      labelTextKey: "pickup.complete.remark",
+      iconData: Entypo.new_message,
+    );
+
+    final rescheduleRemarkBox = DisplayText(
+      text: _pickup!.rescheduleRemark ?? "",
+      labelTextKey: "pickup.reschedul.remark",
+      iconData: Entypo.new_message,
+    );
+
+    final customerRemarkBox = DisplayText(
+      text: _pickup!.customerRemark ?? "",
+      labelTextKey: "pickup.customer.remark",
+      iconData: Entypo.new_message,
    );

    final continueBtn = fcsButton(
@@ -111,12 +146,6 @@ class _PickupInfoState extends State<PickupInfo> {
      callack: _gotoEditor,
    );

-    final pickupDateBox = DisplayText(
-      text: "12-05-2021",
-      labelTextKey: "pickup.date",
-      iconData: Icons.date_range,
-    );
-
    return LocalProgress(
      inAsyncCall: _isLoading,
      child: Scaffold(
@@ -145,11 +174,27 @@ class _PickupInfoState extends State<PickupInfo> {
                  pickupNumberBox,
                  pickupDateBox,
                  timeBox,
+                  customerBox,
+                  _pickup!.completeRemark == null ||
+                          _pickup!.completeRemark == ""
+                      ? Container()
+                      : customerRemarkBox,
                  staffNameBox,
-                  remarkBox,
                  statusBox,
-                  _package!.photoUrls.length == 0 ? Container() : img,
-                  _package!.status == "packed" ? continueBtn : Container(),
+                  _pickup!.rescheduleRemark == null ||
+                          _pickup!.rescheduleRemark == ""
+                      ? Container()
+                      : rescheduleRemarkBox,
+                  _pickup!.completeRemark == null ||
+                          _pickup!.completeRemark == ""
+                      ? Container()
+                      : completeRemarkBox,
+                  deliveryAddressBox,
+                  _pickup!.photoUrls.length == 0 ? Container() : img,
+                  _pickup!.status == "confirmed" ||
+                          _pickup!.status == "rescheduled"
+                      ? continueBtn
+                      : Container(),
                  SizedBox(
                    height: 20,
                  )
@@ -162,41 +207,16 @@ class _PickupInfoState extends State<PickupInfo> {
    );
  }

-  _delete() {
-    showConfirmDialog(context, "pickup.delete.confirm", _deletePackage);
-  }
-
-  _deletePackage() async {
-    setState(() {
-      _isLoading = true;
-    });
-    PackageModel packageModel =
-        Provider.of<PackageModel>(context, listen: false);
-    try {
-      await packageModel.deleteProcessing(_package!);
-      Navigator.pop<bool>(context, true);
-    } catch (e) {
-      showMsgDialog(context, "Error", e.toString());
-    } finally {
-      setState(() {
-        _isLoading = false;
-      });
-    }
-  }
-
  _gotoEditor() async {
    bool? deleted = await Navigator.push<bool>(
        context,
        CupertinoPageRoute(
-            builder: (context) => PickupEditor(
-                  package: widget.package,
-                )));
+            builder: (context) => PickupEditor(pickup: widget.pickup)));
    if (deleted ?? false) {
      Navigator.pop(context);
    } else {
-      PackageModel packageModel =
-          Provider.of<PackageModel>(context, listen: false);
-      Package? p = await packageModel.getPackage(_package!.id!);
+      Pickup? p = await context.read<PickupModel>().getPickup(_pickup!.id!);
+      if (p == null) return;
      initPackage(p);
    }
  }
--- a/lib/pages/pickup/pickup_list.dart
+++ b/lib/pages/pickup/pickup_list.dart
@@ -1,10 +1,12 @@
 import 'package:fcs/domain/entities/package.dart';
+import 'package:fcs/domain/entities/pickup.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/package/model/package_model.dart';
 import 'package:fcs/pages/package_search/package_serach.dart';
 import 'package:fcs/pages/pickup/pickup_editor.dart';
 import 'package:fcs/pages/pickup/pickup_info.dart';
 import 'package:fcs/pages/pickup/pickup_list_row.dart';
+import 'package:fcs/pages/pickup_search/pickup_serach.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:fcs/pagination/paginator_listview.dart';
@@ -12,6 +14,8 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

+import 'model/pickup_model.dart';
+
 class PickupList extends StatefulWidget {
  @override
  _PickupListState createState() => _PickupListState();
@@ -32,8 +36,8 @@ class _PickupListState extends State<PickupList> {

  @override
  Widget build(BuildContext context) {
-    var packageModel = Provider.of<PackageModel>(context);
-    var packages = packageModel.activePackages;
+    var pickupModel = Provider.of<PickupModel>(context);
+    var pickups = pickupModel.pickups;

    return LocalProgress(
      inAsyncCall: _isLoading,
@@ -58,29 +62,25 @@ class _PickupListState extends State<PickupList> {
                  color: Colors.white,
                ),
                iconSize: 30,
-                onPressed: () => searchPackage(context,
-                    callbackPackageSelect: _searchCallback),
+                onPressed: () => searchPickup(context,
+                    callbackPickupSelect: _searchCallback),
              ),
            ],
          ),
-          body: PaginatorListView<Package>(
-            paginatorListener: packages!,
-            rowBuilder: (p) => PickupListRow(
-              key: ValueKey(p.id),
-              package: p,
-            ),
+          body: PaginatorListView<Pickup>(
+            paginatorListener: pickups!,
+            rowBuilder: (p) => PickupListRow(key: ValueKey(p.id), pickup: p),
            color: primaryColor,
          )),
    );
  }

-  _searchCallback(Package package) async {
-    var packageModel = Provider.of<PackageModel>(context, listen: false);
-    Package? _package = await packageModel.getPackage(package.id!);
-    if (_package == null) return;
+  _searchCallback(Pickup pickup) async {
+    Pickup? _pickup = await context.read<PickupModel>().getPickup(pickup.id!);
+    if (_pickup == null) return;
    Navigator.push(
      context,
-      CupertinoPageRoute(builder: (context) => PickupInfo(package: _package)),
+      CupertinoPageRoute(builder: (context) => PickupInfo(pickup: _pickup)),
    );
  }
 }
--- a/lib/pages/pickup/pickup_list_row.dart
+++ b/lib/pages/pickup/pickup_list_row.dart
@@ -1,4 +1,4 @@
-import 'package:fcs/domain/entities/package.dart';
+import 'package:fcs/domain/entities/pickup.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/pickup/pickup_info.dart';
@@ -7,29 +7,28 @@ import 'package:flutter/material.dart';
 import 'package:flutter_vector_icons/flutter_vector_icons.dart';
 import 'package:intl/intl.dart';

-typedef CallbackPackageSelect(Package package);
+typedef CallbackPickupSelect(Pickup pickup);

 class PickupListRow extends StatelessWidget {
-  final Package? package;
-  final CallbackPackageSelect? callbackPackageSelect;
+  final Pickup? pickup;
+  final CallbackPickupSelect? callbackPickupSelect;
  final double dotSize = 15.0;
  final DateFormat dateFormat = new DateFormat("dd MMM yyyy");

-  PickupListRow({Key? key, this.package, this.callbackPackageSelect})
+  PickupListRow({Key? key, this.pickup, this.callbackPickupSelect})
      : super(key: key);

  @override
  Widget build(BuildContext context) {
    return InkWell(
      onTap: () {
-        if (callbackPackageSelect != null) {
-          callbackPackageSelect!(package!);
+        if (callbackPickupSelect != null) {
+          callbackPickupSelect!(pickup!);
          return;
        }
        Navigator.push(
          context,
-          CupertinoPageRoute(
-              builder: (context) => PickupInfo(package: package)),
+          CupertinoPageRoute(builder: (context) => PickupInfo(pickup: pickup!)),
        );
      },
      child: Container(
@@ -56,19 +55,21 @@ class PickupListRow extends StatelessWidget {
                          Padding(
                            padding: const EdgeInsets.only(left: 8.0),
                            child: new Text(
-                              package!.id == null ? '' : package!.trackingID!,
+                              pickup?.pickupNumber ?? '',
                              style: new TextStyle(
                                  fontSize: 15.0, color: Colors.black),
                            ),
                          ),
                          Padding(
-                            padding: const EdgeInsets.only(left: 8.0),
+                            padding: const EdgeInsets.only(left: 10.0, top: 10),
                            child: new Text(
-                              package!.market == null ? '' : package!.market!,
+                              pickup!.pickupDate != null
+                                  ? dateFormat.format(pickup!.pickupDate!)
+                                  : "",
                              style: new TextStyle(
-                                  fontSize: 15.0, color: Colors.black),
+                                  fontSize: 15.0, color: Colors.grey),
                            ),
-                          ),
+                          )
                        ],
                      ),
                    ),
@@ -78,19 +79,7 @@ class PickupListRow extends StatelessWidget {
            ),
            Column(
              children: <Widget>[
-                Padding(
-                  padding: const EdgeInsets.all(3.0),
-                  child: getStatus(package!.status ?? ""),
-                ),
-                Padding(
-                  padding: const EdgeInsets.all(0),
-                  child: new Text(
-                    package!.currentStatusDate != null
-                        ? dateFormat.format(package!.currentStatusDate!)
-                        : '',
-                    style: new TextStyle(fontSize: 15.0, color: Colors.grey),
-                  ),
-                ),
+                getStatus(pickup!.status ?? ""),
              ],
            )
          ],