update pickup

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);
     }
   }