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

move reportUrl and reportProjectId from config to setting

Browse Source
This commit is contained in:
tzw
2024-10-07 20:42:45 +06:30
parent ff55b219e3
commit 966758d2f8
15 changed files with 75 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pages/carton/model/consignee_selection_model.dart
View File

@@ -2,10 +2,10 @@ import 'dart:async';
import 'dart:convert';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/config.dart';
import 'package:logging/logging.dart';
import '../../../constants.dart';
import '../../../data/services/services.dart';
import '../../../domain/entities/user.dart';
import '../../../helpers/api_helper.dart';
import '../../../helpers/firebase_helper.dart';
@@ -56,7 +56,7 @@ class ConsigneeSelectionModel extends BaseModel {
var result = await requestAPI(
"/api/fts/$user_collection/$escapeSender/$rowPerPage", "GET",
url: Config.instance.reportURL, token: await getToken());
url: Services.setting.reportURL, token: await getToken());
if (result != null) {
for (var row in result) {

5
lib/pages/carton/model/sender_selection_model.dart
View File

@@ -3,9 +3,8 @@ import 'dart:convert';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:logging/logging.dart';
import '../../../config.dart';
import '../../../constants.dart';
import '../../../data/services/services.dart';
import '../../../domain/entities/user.dart';
import '../../../helpers/api_helper.dart';
import '../../../helpers/firebase_helper.dart';
@@ -57,7 +56,7 @@ class SenderSelectionModel extends BaseModel {
var result = await requestAPI(
"/api/fts/$user_collection/$escapeSender/$rowPerPage", "GET",
url: Config.instance.reportURL, token: await getToken());
url: Services.setting.reportURL, token: await getToken());
if (result != null) {
for (var row in result) {

9
lib/pages/fcs_shipment/model/fcs_shipment_model.dart
View File

@@ -157,9 +157,12 @@ class FcsShipmentModel extends BaseModel {
void initUser(user) {
super.initUser(user);
_loadShipmentTypes();
_loadShipmentConsignees();
_loadShipmentPorts();
if (user != null && user.hasFcsShipments()) {
_loadShipmentTypes();
_loadShipmentConsignees();
_loadShipmentPorts();
}
}
@override

1
lib/pages/main/model/main_model.dart
View File

@@ -141,6 +141,7 @@ class MainModel extends ChangeNotifier {
try {
Services.instance.authService.getSetting().listen((event) {
this.setting = event;
Services.setting = event;
models.forEach((m) => m.initSetting(setting));
notifyListeners();
});

2
lib/pages/package/package_info.dart
View File

@@ -133,7 +133,7 @@ class _PackageInfoState extends State<PackageInfo> {
if (d == null) return;
_changeDeliverayAddress(d);
}
: () {},
: null,
);
return LocalProgress(