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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Thinzar Win
2020-10-08 11:44:02 +06:30
parent 88967ba2d4 7ae74275cd
commit aecf89e17d
22 changed files with 201 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
import 'package:fcs/domain/entities/box.dart';
import 'package:fcs/domain/entities/cargo.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/vo/shipping_address.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';
@@ -30,7 +30,7 @@ class _PickupBoxEditorState extends State<PickupBoxEditor> {
bool isNew;
bool isMixBox = false;
ShippingAddress _shippingAddress = new ShippingAddress();
DeliveryAddress _shippingAddress = new DeliveryAddress();
@override
void initState() {

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

@@ -1,7 +1,7 @@
import 'package:fcs/domain/entities/box.dart';
import 'package:fcs/domain/entities/cargo.dart';
import 'package:fcs/domain/entities/pickup.dart';
import 'package:fcs/domain/vo/shipping_address.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/box/model/box_model.dart';
@@ -59,7 +59,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
bool _isLoading = false;
var now = new DateTime.now();
bool isNew;
ShippingAddress _shippingAddress = new ShippingAddress();
DeliveryAddress _shippingAddress = new DeliveryAddress();
int _currVal = 1;
@@ -304,7 +304,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
_currVal == 3
? Container(
child: ShippingAddressRow(
shippingAddress: ShippingAddress(
shippingAddress: DeliveryAddress(
fullName: 'FCS Office',
addressLine1: '154-19 64th Ave.',
addressLine2: 'Flushing',
@@ -683,7 +683,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
List<Box> _boxes = [boxes[0], boxes[1]];
return _boxes.asMap().entries.map((_box) {
ShippingAddress shippingAddress = _box.value.shippingAddress;
DeliveryAddress shippingAddress = _box.value.shippingAddress;
return InkWell(
onTap: () {