sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change name to delivery address

Browse Source
This commit is contained in:
PhyoThandar
2020-10-08 15:54:43 +06:30
parent 7ae74275cd
commit 7ecb25409b
15 changed files with 689 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pages/shipment/pickup_box_editor.dart
View File

@@ -4,8 +4,8 @@ import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/vo/delivery_address.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/localization/app_translations.dart';
import 'package:fcs/pages/shipment_address/model/shipment_address_model.dart';
import 'package:fcs/pages/shipment_address/shipping_address_row.dart';
import 'package:fcs/pages/delivery_address/delivery_address_row.dart';
import 'package:fcs/pages/delivery_address/model/delivery_address_model.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/my_data_table.dart';
import 'package:fcs/pages/widgets/progress.dart';
@@ -54,8 +54,8 @@ class _PickupBoxEditorState extends State<PickupBoxEditor> {
];
var shipmentModel =
Provider.of<ShipmentAddressModel>(context, listen: false);
_shippingAddress = shipmentModel.shippingAddresses[1];
Provider.of<DeliveryAddressModel>(context, listen: false);
_shippingAddress = shipmentModel.deliveryAddresses[1];
isNew = true;
_box = Box(
@@ -222,7 +222,7 @@ class _PickupBoxEditorState extends State<PickupBoxEditor> {
color: primaryColor, fontWeight: FontWeight.bold),
),
children: [
ShippingAddressRow(shippingAddress: _shippingAddress),
DeliveryAddressRow(shippingAddress: _shippingAddress),
Container(
padding:
EdgeInsets.only(top: 20, bottom: 15, right: 15),

12
lib/pages/shipment/shipment_editor.dart
View File

@@ -5,10 +5,10 @@ import 'package:fcs/domain/vo/delivery_address.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/localization/app_translations.dart';
import 'package:fcs/pages/box/model/box_model.dart';
import 'package:fcs/pages/delivery_address/delivery_address_row.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/shipment/model/shipment_model.dart';
import 'package:fcs/pages/shipment_address/model/shipment_address_model.dart';
import 'package:fcs/pages/shipment_address/shipping_address_row.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
import 'package:fcs/pages/widgets/local_text.dart';
@@ -92,8 +92,8 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
_pickUp = Shipment(cargoTypes: _cargoTypes);
}
var shipmentModel =
Provider.of<ShipmentAddressModel>(context, listen: false);
_shippingAddress = shipmentModel.shippingAddresses[1];
Provider.of<DeliveryAddressModel>(context, listen: false);
_shippingAddress = shipmentModel.deliveryAddresses[1];
}
@override
@@ -309,7 +309,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
),
_currVal == 3
? Container(
child: ShippingAddressRow(
child: DeliveryAddressRow(
shippingAddress: DeliveryAddress(
fullName: 'FCS Office',
addressLine1: '154-19 64th Ave.',
@@ -417,7 +417,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
),
Padding(
padding: const EdgeInsets.only(left: 10.0),
child: ShippingAddressRow(
child: DeliveryAddressRow(
shippingAddress: _shippingAddress),
),
Container(