add update shipments

2020-10-18 02:38:46 +06:30
parent fa9738f307
commit 4f8bde40b0
37 changed files with 596 additions and 455 deletions
--- a/lib/pages/shipment/shipment_editor.dart
+++ b/lib/pages/shipment/shipment_editor.dart
@@ -1,9 +1,8 @@
 import 'package:fcs/domain/constants.dart';
-import 'package:fcs/domain/entities/box.dart';
+import 'package:fcs/domain/entities/carton.dart';
 import 'package:fcs/domain/entities/shipment.dart';
 import 'package:fcs/domain/vo/delivery_address.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/pages/box/model/box_model.dart';
 import 'package:fcs/pages/delivery_address/model/delivery_address_model.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/main/util.dart';
@@ -11,24 +10,23 @@ import 'package:fcs/pages/shipment/model/shipment_model.dart';
 import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
 import 'package:fcs/pages/widgets/delivery_address_selection.dart';
 import 'package:fcs/pages/widgets/display_text.dart';
+import 'package:fcs/pages/widgets/fcs_id_icon.dart';
 import 'package:fcs/pages/widgets/input_date.dart';
 import 'package:fcs/pages/widgets/input_time.dart';
 import 'package:fcs/pages/widgets/local_button.dart';
-import 'package:fcs/pages/widgets/local_dropdown.dart';
 import 'package:fcs/pages/widgets/local_radio_buttons.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/local_title.dart';
-import 'package:fcs/pages/widgets/multi_img_controller.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_icons/flutter_icons.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';

 import 'box_row.dart';
 import 'shipment_box_editor.dart';
+import 'widgets.dart';

 class ShipmentEditor extends StatefulWidget {
  final Shipment shipment;
@@ -40,55 +38,37 @@ class ShipmentEditor extends StatefulWidget {

 class _ShipmentEditorState extends State<ShipmentEditor> {
  var dateFormatter = new DateFormat('dd MMM yyyy');
-  final numberFormatter = new NumberFormat("#,###");
-  MultiImgController multiImgController = MultiImgController();
+  var timeFormatter = new DateFormat('jm');

-  TextEditingController _addressEditingController = new TextEditingController();
  TextEditingController _fromTimeEditingController =
      new TextEditingController();
  TextEditingController _toTimeEditingController = new TextEditingController();
-  TextEditingController _noOfPackageEditingController =
-      new TextEditingController();
-  TextEditingController _weightEditingController = new TextEditingController();
-  TextEditingController _recipientNameEditingController =
-      new TextEditingController();
-  TextEditingController _recipientPhoneEditingController =
-      new TextEditingController();
-  TextEditingController _recipientAddressEditingController =
-      new TextEditingController();
  TextEditingController _pickupDate = new TextEditingController();
-  TextEditingController _handlingFeeController = new TextEditingController();

  Shipment _shipment;
  bool _isLoading = false;
  var now = new DateTime.now();
  bool _isNew;

-  int _currVal = 1;
  String _selectedShipmentType;

  @override
  void initState() {
    super.initState();
-    _selectedShipmentType = shipment_local_pickup;

    if (widget.shipment != null) {
      _isNew = false;
      _shipment = widget.shipment;
-      _addressEditingController.text = _shipment.address;
+      _selectedShipmentType = _shipment.shipmentType;
      _fromTimeEditingController.text = _shipment.pickupTimeStart;
      _toTimeEditingController.text = _shipment.pickupTimeEnd;
-      _noOfPackageEditingController.text = _shipment.numberOfPackage.toString();
-      _weightEditingController.text = _shipment.weight.toString();
      _pickupDate.text = dateFormatter.format(_shipment.pickupDate ?? now);
-      // _handlingFeeController.text =
-      //     numberFormatter.format(_shipment.handlingFee);
-      _currVal = _shipment.radioIndex;
    } else {
      _isNew = true;
+      _selectedShipmentType = shipment_local_pickup;
      _pickupDate.text = dateFormatter.format(now);
-      _fromTimeEditingController.text = "${(now.hour)}:${(now.minute)}";
-      _toTimeEditingController.text = "${(now.hour)}:${(now.minute)}";
+      _fromTimeEditingController.text = "${timeFormatter.format(now)}";
+      _toTimeEditingController.text = "${timeFormatter.format(now)}";
      _shipment = Shipment(boxes: []);
      var shipmentModel =
          Provider.of<DeliveryAddressModel>(context, listen: false);
@@ -106,7 +86,11 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
  Widget build(BuildContext context) {
    MainModel mainModel = Provider.of<MainModel>(context);
    ShipmentModel pickupModel = Provider.of<ShipmentModel>(context);
-
+    final shipmentNumberBox = getShipmentNumberStatus(context, _shipment);
+    bool isLocalPickup = _selectedShipmentType == shipment_local_pickup;
+    bool isCourierPickup = _selectedShipmentType == shipment_courier_pickup;
+    bool isLocalDropoff = _selectedShipmentType == shipment_local_dropoff;
+    bool isCourierDropoff = _selectedShipmentType == shipment_courier_dropoff;
    final fromTimeBox = InputTime(
        labelTextKey: 'shipment.from',
        iconData: Icons.timer,
@@ -124,20 +108,17 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
      iconData: Icons.date_range,
      controller: _pickupDate,
    );
-    final localDropoffAddress = DisplayText(
-        iconData: Icons.location_on,
-        labelTextKey: "Local Dropoff Address",
-        text: mainModel.setting.usaAddress);
-    final curierDropoffAddress = FloatingActionButton.extended(
-      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-      onPressed: () {},
-      icon: Icon(Icons.arrow_right),
-      label: Text(
-        'Visit courier websie for nearest drop-off',
-        style: TextStyle(fontSize: 12),
-      ),
-      backgroundColor: primaryColor,
-    );
+    final curierDropoffAddress = Padding(
+        padding: EdgeInsets.all(8),
+        child: FloatingActionButton.extended(
+          onPressed: _openCourierWebsite,
+          icon: Icon(Icons.open_in_new, color: primaryColor),
+          label: Text(
+            'Visit courier websie \nfor nearest drop-off',
+            style: TextStyle(fontSize: 16, color: primaryColor),
+          ),
+          backgroundColor: Colors.white,
+        ));
    final pickupAddressBox = DefaultDeliveryAddress(
      deliveryAddress: _shipment.pickupAddress,
      iconData: Icons.location_on,
@@ -156,28 +137,22 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
        });
      },
    );
-    var boxModel = Provider.of<BoxModel>(context);
-    var handlingFeeBox = DisplayText(
-        labelTextKey: "shipment.handling.fee",
-        text: "10",
-        iconData: FontAwesomeIcons.moneyBill);
-    var shipmentTypeBox = LocalDropdown<String>(
-      callback: (v) {
-        setState(() {
-          _selectedShipmentType = v;
-        });
-      },
-      iconData: SimpleLineIcons.direction,
-      selectedValue: _selectedShipmentType,
-      values: pickupModel.shipmentTypes,
-    );
+    var localDropoffAddressBox = Row(children: [
+      FcsIDIcon(),
+      Expanded(
+        child: DisplayText(
+          text: mainModel.setting.usaAddress,
+        ),
+      )
+    ]);
    final createBtn = LocalButton(
      textKey: "shipment.create",
-      callBack: _create,
+      callBack: _save,
    );

    final updateBtn = LocalButton(
      textKey: "shipment.update",
+      callBack: _save,
    );

    return LocalProgress(
@@ -205,6 +180,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
          padding: const EdgeInsets.all(10.0),
          child: ListView(
            children: <Widget>[
+              _isNew ? Container() : Center(child: shipmentNumberBox),
              LocalTitle(textKey: "shipment.type"),
              LocalRadioButtons(
                  values: pickupModel.shipmentTypes,
@@ -214,16 +190,28 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
                      _selectedShipmentType = v;
                    });
                  }),
-              // handlingFeeBox,
-              // shipmentTypeBox,
-              LocalTitle(textKey: "shipment.location"),
-              pickupAddressBox,
-              LocalTitle(textKey: "shipment.date.time"),
-              pickupDateBox,
-              fromTimeBox,
-              toTimeBox,
-              // localDropoffAddress,
-              // curierDropoffAddress,
+              ...(isLocalDropoff
+                  ? [
+                      LocalTitle(textKey: "shipment.location.dropoff"),
+                      localDropoffAddressBox
+                    ]
+                  : []),
+              ...(isCourierDropoff
+                  ? [
+                      LocalTitle(textKey: "shipment.courier.dropoff"),
+                      curierDropoffAddress
+                    ]
+                  : []),
+              ...(isCourierPickup || isLocalPickup
+                  ? [
+                      LocalTitle(textKey: "shipment.location"),
+                      pickupAddressBox,
+                      LocalTitle(textKey: "shipment.date.time"),
+                      pickupDateBox,
+                      fromTimeBox,
+                      toTimeBox,
+                    ]
+                  : []),
              LocalTitle(
                textKey: "boxes.name",
                trailing: IconButton(
@@ -232,7 +220,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
                    color: primaryColor,
                  ),
                  onPressed: () async {
-                    Box box = await Navigator.push(
+                    Carton box = await Navigator.push(
                      context,
                      CupertinoPageRoute(
                          builder: (context) => ShipmentBoxEditor()),
@@ -252,11 +240,11 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
    );
  }

-  List<Widget> getBoxList(BuildContext context, List<Box> boxes) {
+  List<Widget> getBoxList(BuildContext context, List<Carton> boxes) {
    return boxes.asMap().entries.map((_box) {
      return InkWell(
        onTap: () async {
-          Box box = await Navigator.of(context).push(CupertinoPageRoute(
+          Carton box = await Navigator.of(context).push(CupertinoPageRoute(
              builder: (context) => ShipmentBoxEditor(box: _box.value)));
          _saveBox(box);
        },
@@ -267,7 +255,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
              onTap: () => _removeBox(_box.value),
              child: Padding(
                padding: const EdgeInsets.all(8.0),
-                child: Icon(Icons.remove, color: primaryColor),
+                child: Icon(Icons.remove_circle, color: primaryColor),
              ),
            ),
          ],
@@ -276,24 +264,25 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
    }).toList();
  }

-  _addBox(Box box) {
+  _addBox(Carton box) {
    if (box == null) return;
+    box.cartonType = carton_from_shipments;
    _shipment.boxes.add(box);
    setState(() {});
  }

-  _saveBox(Box box) {
+  _saveBox(Carton box) {
    if (box == null) return;
    setState(() {});
  }

-  _removeBox(Box box) {
+  _removeBox(Carton box) {
    if (box == null) return;
    _shipment.boxes.remove(box);
    setState(() {});
  }

-  _create() async {
+  _save() async {
    _shipment.shipmentType = this._selectedShipmentType;
    _shipment.pickupDate = dateFormatter.parse(_pickupDate.text);
    _shipment.pickupTimeStart = _fromTimeEditingController.text;
@@ -307,9 +296,9 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
      if (_isNew) {
        await shipmentModel.createShipment(_shipment);
      } else {
-        await shipmentModel.createShipment(_shipment);
+        await shipmentModel.updateShipment(_shipment);
      }
-      Navigator.pop(context);
+      Navigator.pop(context, true);
    } catch (e) {
      showMsgDialog(context, "Error", e.toString());
    } finally {
@@ -318,4 +307,9 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
      });
    }
  }
+
+  _openCourierWebsite() {
+    MainModel mainModel = Provider.of<MainModel>(context, listen: false);
+    launch("${mainModel.setting.courierWebsite}");
+  }
 }