Merge branch 'master' of https://git.mokkon.com/sainw/fcs

lib/pages/delivery_address/delivery_address_list.dart

@@ -12,7 +12,11 @@ import 'delivery_address_row.dart';
 import 'model/delivery_address_model.dart';
 
 class DeliveryAddressList extends StatefulWidget {
-  const DeliveryAddressList({Key key}) : super(key: key);
+  final bool isAdminCreation;
+  final DeliveryAddress deliveryAddress;
+  const DeliveryAddressList(
+      {Key key, this.isAdminCreation = false, this.deliveryAddress})
+      : super(key: key);
   @override
   _DeliveryAddressListState createState() => _DeliveryAddressListState();
 }
@@ -80,8 +84,13 @@ class _DeliveryAddressListState extends State<DeliveryAddressList> {
           child: Padding(
             padding: const EdgeInsets.all(10.0),
             child: Icon(Icons.check,
-                color:
-                    deliveryAddress.isDefault ? primaryColor : Colors.black26),
+                color: widget.isAdminCreation
+                    ? widget.deliveryAddress.id == deliveryAddress.id
+                        ? primaryColor
+                        : Colors.black26
+                    : deliveryAddress.isDefault
+                        ? primaryColor
+                        : Colors.black26),
           ),
         ),
         Expanded(
@@ -104,18 +113,24 @@ class _DeliveryAddressListState extends State<DeliveryAddressList> {
   }
 
   Future<void> _select(DeliveryAddress deliveryAddress) async {
-    if (deliveryAddress.isDefault) {
-      Navigator.pop(context);
-      return;
-    }
     setState(() {
       _isLoading = true;
     });
-    var deliveryAddressModel =
-        Provider.of<DeliveryAddressModel>(context, listen: false);
+
     try {
-      await deliveryAddressModel.selectDefalutDeliveryAddress(deliveryAddress);
-      Navigator.pop(context);
+      if (widget.isAdminCreation) {
+        Navigator.pop<DeliveryAddress>(context, deliveryAddress);
+      } else {
+        if (deliveryAddress.isDefault) {
+          Navigator.pop(context);
+          return;
+        }
+        var deliveryAddressModel =
+            Provider.of<DeliveryAddressModel>(context, listen: false);
+        await deliveryAddressModel
+            .selectDefalutDeliveryAddress(deliveryAddress);
+        Navigator.pop(context);
+      }
     } catch (e) {
       showMsgDialog(context, "Error", e.toString());
     } finally {