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

add pickups

Browse Source
This commit is contained in:
Sai Naw Wun
2020-05-31 15:00:11 +06:30
parent d5847722d8
commit 3f6a66b887
57 changed files with 1368 additions and 1236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/model/base_model.dart
View File

@@ -1,9 +1,9 @@
import 'package:flutter/foundation.dart';
import 'package:fcs/model/api_helper.dart';
import 'package:fcs/model/main_model.dart';
import '../vo/setting.dart';
import '../vo/user.dart';
import 'main_model.dart';
abstract class BaseModel extends ChangeNotifier {
User user;

1
lib/model/chart_model.dart
View File

@@ -10,7 +10,6 @@ import 'package:fcs/vo/revenue.dart';
import 'base_model.dart';
import 'constants.dart';
import 'firebase_helper.dart';
class ChartModel extends BaseModel {
final log = Logger('ChartModel');

26
lib/model/main_model.dart
View File

@@ -51,7 +51,7 @@ class MainModel extends ChangeNotifier {
phoneNumber: '+95 9 444444444',
fcsID: 'FCS-0203-390-2',
shippingAddress:
'154-19 64th Ave.Flushing, NY 11367 TEL. +1 (929) 215-2247',
'154-19 64th Ave.Flushing, \nNY 11367 \nTEL. +1 (929) 215-2247',
deliveryAddress: '39 42th St. Kyaut Ta Thar Township Yangon');
Setting setting;
@@ -70,6 +70,23 @@ class MainModel extends ChangeNotifier {
// this.isOnline = _isOnline;
// notifyListeners();
// });
_loadFcs();
}
_loadFcs() async {
user = await SharedPref.getUser();
notifyListeners();
}
saveUser(String pin, String phone) {
if (pin == "000000") {
user = User(name: "Owner", phoneNumber: phone);
SharedPref.saveUser(user);
} else {
user = User(name: "Customer", phoneNumber: phone);
SharedPref.saveUser(user);
}
notifyListeners();
}
resetPinTimer() {
@@ -83,7 +100,7 @@ class MainModel extends ChangeNotifier {
}
bool isLogin() {
return true;
return this.user != null;
}
bool hasEmail() {
@@ -138,7 +155,6 @@ class MainModel extends ChangeNotifier {
void addModel(BaseModel model) {
models.add(model);
model.mainModel = this;
}
void _initUser(User user) {
@@ -292,6 +308,10 @@ class MainModel extends ChangeNotifier {
}
Future<void> logout() async {
this.user = null;
notifyListeners();
return;
if (this.userListener != null) {
await this.userListener.cancel();
}

21
lib/model/notification_model.dart
View File

@@ -11,25 +11,26 @@ class NotificationModel extends BaseModel {
int filer = 0;
List<Notification> notifications = [
Notification(
desc: 'A102A-34-#23',
status: 'delivered',
desc: 'Package delivered!',
status: 'A102A-34-#23',
time: DateTime(2020, 4, 28, 10, 32)),
Notification(
desc: 'A102A-34-#24',
status: 'picked up',
desc: 'Package in transit!',
status: 'A102A-34-#24',
time: DateTime(2020, 4, 26, 9, 32)),
Notification(
desc: 'A102A-34-#23',
status: 'sorted',
desc: 'Package delivered!',
status: 'A102A-34-#23',
time: DateTime(2020, 4, 24, 10, 32)),
Notification(
desc: 'ORDER # 114-0725982-9074639',
status: 'audited',
marketPlace: "Macy",
desc: "Audited received goods!",
status: 'ORDER # 114-0725982-9074639',
time: DateTime(2020, 4, 22, 12, 30)),
Notification(
marketPlace: "Amazon",
desc: 'ORDER # 114-0725982-9074639',
status: 'received',
desc: "Receive goods!",
status: 'ORDER # 323-982-2308',
time: DateTime(2020, 4, 22, 12, 22))
];

100
lib/model/pickup_model.dart
View File

@@ -14,7 +14,8 @@ class PickUpModel extends BaseModel {
var profile = FCSProfile(
id: '1',
usaAddress: '154-19 64th Ave.\nFlushing, NY 11367\nTEL. +1 (929) 215-2247',
usaAddress:
'154-19 64th Ave.\nFlushing, NY 11367\nTEL. +1 (929) 215-2247',
mmAddress: 'FCS Trading Myanmar\nRoom 333, Yangon',
usaContactNumber: '1 (929) 215-2247',
mmContactNumber: '+95 9 700224723',
@@ -30,7 +31,8 @@ class PickUpModel extends BaseModel {
toTime: '3PM',
numberOfPackage: 5,
weight: 25,
status: 'pickup',
status: 'Pending',
date: DateTime(2020, 5, 1),
address:
'154-19 64th Ave.\nFlushing, NY 11367\nTEL. +1 (929) 215-2247'),
PickUp(
@@ -41,7 +43,8 @@ class PickUpModel extends BaseModel {
toTime: '3PM',
numberOfPackage: 5,
weight: 25,
status: 'pickup',
status: 'Assigned',
date: DateTime(2020, 5, 6),
address:
'154-19 64th Ave.\nFlushing, NY 11367\nTEL. +1 (929) 215-2247'),
PickUp(
@@ -52,11 +55,100 @@ class PickUpModel extends BaseModel {
toTime: '3PM',
numberOfPackage: 5,
weight: 25,
status: "delivered",
status: "Pickuped",
date: DateTime(2020, 5, 9),
address:
'154-19 64th Ave.\nFlushing, NY 11367\nTEL. +1 (929) 215-2247'),
PickUp(
id: "P200412 - 12 Apr 2020",
userName: "Ko Kyaw Nyi",
phoneNumber: '+959111111111',
fromTime: '1PM',
toTime: '3PM',
numberOfPackage: 5,
weight: 25,
status: 'Pickuped',
date: DateTime(2020, 5, 15),
address:
'154-19 64th Ave.\nFlushing, NY 11367\nTEL. +1 (929) 215-2247'),
PickUp(
id: "P200125 - 12 May 2020",
userName: "Ko Kyaw Nyi",
phoneNumber: '+959111111111',
fromTime: '1PM',
toTime: '3PM',
numberOfPackage: 5,
weight: 25,
status: 'Pickuped',
date: DateTime(2020, 5, 20),
address:
'154-19 64th Ave.\nFlushing, NY 11367\nTEL. +1 (929) 215-2247'),
PickUp(
id: "P200441 - 13 Apr 2020",
userName: "Ko Kyaw Nyi",
phoneNumber: '+959111111111',
fromTime: '1PM',
toTime: '3PM',
numberOfPackage: 5,
weight: 25,
status: "Pickuped",
date: DateTime(2020, 5, 21),
address:
'154-19 64th Ave.\nFlushing, NY 11367\nTEL. +1 (929) 215-2247'),
PickUp(
id: "P200441 - 10 Apr 2020",
userName: "Ko Kyaw Nyi",
phoneNumber: '+959111111111',
fromTime: '1PM',
toTime: '3PM',
numberOfPackage: 5,
weight: 25,
status: "Canceled",
date: DateTime(2020, 5, 25),
address:
'154-19 64th Ave.\nFlushing, NY 11367\nTEL. +1 (929) 215-2247'),
PickUp(
id: "P200441 - 6 Apr 2020",
userName: "Ko Kyaw Nyi",
phoneNumber: '+959111111111',
fromTime: '1PM',
toTime: '3PM',
numberOfPackage: 5,
weight: 25,
status: "Canceled",
date: DateTime(2020, 5, 27),
address:
'154-19 64th Ave.\nFlushing, NY 11367\nTEL. +1 (929) 215-2247'),
];
List<PickUp> get canceled {
List<PickUp> _p = pickups.where((e) => e.status == "Canceled").toList()
..sort((e1, e2) {
return e2.date.compareTo(e1.date);
});
return _p;
}
List<PickUp> get completed {
return pickups.where((e) => e.status == "Pickuped").toList()
..sort((e1, e2) {
return e2.date.compareTo(e1.date);
});
}
List<PickUp> get upcoming {
return pickups
.where((e) =>
e.status == "Pending" ||
e.status == "Assigned" ||
e.status == "Processed" ||
e.status == "Rescheduled")
.toList()
..sort((e1, e2) {
return e2.date.compareTo(e1.date);
});
}
void initUser(user) {
super.initUser(user);
}

1
lib/model/po_model.dart
View File

@@ -11,7 +11,6 @@ import 'package:fcs/vo/po.dart';
import 'package:fcs/vo/popup_menu.dart';
import 'base_model.dart';
import 'constants.dart';
import 'firebase_helper.dart';
class POSubmissionModel extends BaseModel {

16
lib/model/shared_pref.dart
View File

@@ -60,13 +60,21 @@ class SharedPref {
}
static _read(String key) async {
final prefs = await SharedPreferences.getInstance();
return json.decode(prefs.getString(key));
try {
final prefs = await SharedPreferences.getInstance();
return json.decode(prefs.getString(key));
} catch (e) {
print("Error:$e");
}
}
static _save(String key, value) async {
final prefs = await SharedPreferences.getInstance();
prefs.setString(key, json.encode(value));
try {
final prefs = await SharedPreferences.getInstance();
prefs.setString(key, json.encode(value));
} catch (e) {
print("Error:$e");
}
}
static _remove(String key) async {

2
lib/model/shipment_rate_model.dart
View File

@@ -22,6 +22,8 @@ class ShipmentRateModel extends BaseModel {
price: 8),
];
int freeDeliveryWeight=10;
void initUser(user) {
super.initUser(user);
}