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:
Phaung Phaung
2021-09-10 15:24:42 +06:30
parent da9c266629 03c5fc5016
commit 52fe4b4568
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pages/invoice/model/invoice_model.dart
View File

@@ -52,7 +52,7 @@ class InvoiceModel extends BaseModel {
Future<void> _loadInvoices(bool forCustomer) async { Future<void> _loadInvoices(bool forCustomer) async {
if (user == null) return; if (user == null) return;
if (!forCustomer && !user.hasInvoices()) return; if (!forCustomer && !user!.hasInvoices()) return;
String path = "/$invoices_collection"; String path = "/$invoices_collection";
if (listener != null) listener!.cancel(); if (listener != null) listener!.cancel();
_invoices = []; _invoices = [];
@@ -64,7 +64,7 @@ class InvoiceModel extends BaseModel {
.where("is_deleted", isEqualTo: false); .where("is_deleted", isEqualTo: false);
if (forCustomer) { if (forCustomer) {
q = q.where("user_id", isEqualTo: user.id); q = q.where("user_id", isEqualTo: user!.id);
} }
listener = q.snapshots().listen((QuerySnapshot snapshot) { listener = q.snapshots().listen((QuerySnapshot snapshot) {
@@ -83,13 +83,13 @@ class InvoiceModel extends BaseModel {
Paginator _getPaginator(bool isCustomer, bool isCanceled, bool isPaid) { Paginator _getPaginator(bool isCustomer, bool isCanceled, bool isPaid) {
if (!isCustomer) { if (!isCustomer) {
if (user == null || !(user.hasInvoices())) throw "No privilege"; if (user == null || !(user!.hasInvoices())) throw "No privilege";
} }
var pageQuery = FirebaseFirestore.instance var pageQuery = FirebaseFirestore.instance
.collection("/$invoices_collection") .collection("/$invoices_collection")
.where("is_deleted", isEqualTo: false); .where("is_deleted", isEqualTo: false);
if (isCustomer) { if (isCustomer) {
pageQuery = pageQuery.where("user_id", isEqualTo: user.id); pageQuery = pageQuery.where("user_id", isEqualTo: user!.id);
} }
if (isCanceled) { if (isCanceled) {
pageQuery = pageQuery.where("status", isEqualTo: invoice_cancel_status); pageQuery = pageQuery.where("status", isEqualTo: invoice_cancel_status);
@@ -149,7 +149,7 @@ class InvoiceModel extends BaseModel {
} }
Future<void> pay(Payment payment, File file) async { Future<void> pay(Payment payment, File file) async {
String path = Path.join(receipt_labels_files_path, user.id); String path = Path.join(receipt_labels_files_path, user!.id);
String url = await uploadStorage(path, file); String url = await uploadStorage(path, file);
payment.paymentReceiptURL = url; payment.paymentReceiptURL = url;
return Services.instance.invoiceService.pay(payment); return Services.instance.invoiceService.pay(payment);

4
lib/pages/market/model/market_model.dart
View File

@@ -9,7 +9,7 @@ import 'package:logging/logging.dart';
class MarketModel extends BaseModel { class MarketModel extends BaseModel {
final log = Logger('MarketModel'); final log = Logger('MarketModel');
StreamSubscription<QuerySnapshot> listener; StreamSubscription<QuerySnapshot>? listener;
List<Market> markets = []; List<Market> markets = [];
MarketModel() { MarketModel() {
@@ -18,7 +18,7 @@ class MarketModel extends BaseModel {
Future<void> _loadMarkets() async { Future<void> _loadMarkets() async {
try { try {
if (listener != null) listener.cancel(); if (listener != null) listener!.cancel();
listener = FirebaseFirestore.instance listener = FirebaseFirestore.instance
.collection("/$config_collection/$setting_doc_id/$markets_collection") .collection("/$config_collection/$setting_doc_id/$markets_collection")

10
lib/pages/package/model/package_model.dart
View File

@@ -70,7 +70,7 @@ class PackageModel extends BaseModel {
Future<void> _loadPackages(bool isDelivered) async { Future<void> _loadPackages(bool isDelivered) async {
if (user == null) return; if (user == null) return;
if (!((user.hasPackages() || user.hasReceiving() || user.hasProcessing()))) if (!((user!.hasPackages() || user!.hasReceiving() || user!.hasProcessing())))
return; return;
String path = "/$packages_collection"; String path = "/$packages_collection";
@@ -97,11 +97,11 @@ class PackageModel extends BaseModel {
Query listenerQuery = FirebaseFirestore.instance Query listenerQuery = FirebaseFirestore.instance
.collection(path) .collection(path)
.where("is_delivered", isEqualTo: isDelivered) .where("is_delivered", isEqualTo: isDelivered)
.where("user_id", isEqualTo: user.id); .where("user_id", isEqualTo: user!.id);
Query pageQuery = FirebaseFirestore.instance Query pageQuery = FirebaseFirestore.instance
.collection(path) .collection(path)
.where("is_delivered", isEqualTo: isDelivered) .where("is_delivered", isEqualTo: isDelivered)
.where("user_id", isEqualTo: user.id) .where("user_id", isEqualTo: user!.id)
.orderBy("update_time", descending: true); .orderBy("update_time", descending: true);
customerPackages!.refresh( customerPackages!.refresh(
@@ -113,7 +113,7 @@ class PackageModel extends BaseModel {
Future<void> _loadActivePackages() async { Future<void> _loadActivePackages() async {
if (user == null) return; if (user == null) return;
if (!((user.hasPackages() || user.hasReceiving() || user.hasProcessing()))) if (!((user!.hasPackages() || user!.hasReceiving() || user!.hasProcessing())))
return; return;
String path = "/$packages_collection"; String path = "/$packages_collection";
@@ -192,7 +192,7 @@ class PackageModel extends BaseModel {
qsnap = await FirebaseFirestore.instance qsnap = await FirebaseFirestore.instance
.collection("$path") .collection("$path")
.where("tracking_id", isEqualTo: trackingID) .where("tracking_id", isEqualTo: trackingID)
.where("user_id", isEqualTo: user.id) .where("user_id", isEqualTo: user!.id)
.where("is_deleted", isEqualTo: false) .where("is_deleted", isEqualTo: false)
.get(const GetOptions(source: Source.server)); .get(const GetOptions(source: Source.server));
if (qsnap.docs.length > 0) { if (qsnap.docs.length > 0) {