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

fix fcs shipment service

Browse Source
This commit is contained in:
sainw
2024-09-22 16:49:59 +06:30
parent 4036c6ae49
commit 1d171bad69
66 changed files with 1697 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/carton/carton_editor.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/helpers/theme.dart';

2
lib/pages/carton/carton_filter.dart
View File

@@ -2,7 +2,7 @@ import 'package:fcs/pages/carton/model/sender_selection_model.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../domain/constants.dart';
import '../../constants.dart';
import '../../domain/entities/fcs_shipment.dart';
import '../../domain/entities/user.dart';
import '../../helpers/theme.dart';

2
lib/pages/carton/carton_info.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/cargo_type.dart';
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/package.dart';

2
lib/pages/carton/carton_list.dart
View File

@@ -8,7 +8,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:provider/provider.dart';
import '../../domain/constants.dart';
import '../../constants.dart';
import '../../domain/entities/carton.dart';
import '../../pagination/paginator_listview.dart';
import '../carton_search/carton_search.dart';

8
lib/pages/carton/carton_package_editor.dart
View File

@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import '../../../domain/constants.dart';
import '../../constants.dart';
import '../../../domain/entities/carton_size.dart';
import '../../../domain/entities/fcs_shipment.dart';
import '../../../domain/vo/local_step.dart';
@@ -88,8 +88,10 @@ class _CartonPackageEditorState extends State<CartonPackageEditor> {
_length = widget.carton.length;
_width = widget.carton.width;
_height = widget.carton.height;
_cargoTypes = widget.carton.cargoTypes.where((e) => !e.isCutomDuty).toList();
_surchareItems = widget.carton.cargoTypes.where((e) => e.isCutomDuty).toList();
_cargoTypes =
widget.carton.cargoTypes.where((e) => !e.isCutomDuty).toList();
_surchareItems =
widget.carton.cargoTypes.where((e) => e.isCutomDuty).toList();
var s = await context
.read<FcsShipmentModel>()

17
lib/pages/carton/carton_package_form.dart
View File

@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import '../../../domain/constants.dart';
import '../../constants.dart';
import '../../../domain/entities/carton_size.dart';
import '../../../domain/entities/fcs_shipment.dart';
import '../../../domain/vo/local_step.dart';
@@ -26,13 +26,12 @@ import 'package_selection_widget.dart';
class CartonPackageForm extends StatefulWidget {
final User sender;
final User consignee;
const CartonPackageForm(
{Key? key,
required this.sender,
required this.consignee,
})
: super(key: key);
const CartonPackageForm({
Key? key,
required this.sender,
required this.consignee,
}) : super(key: key);
@override
State<CartonPackageForm> createState() => _CartonPackageFormState();
@@ -148,7 +147,7 @@ class _CartonPackageFormState extends State<CartonPackageForm> {
onPrevious: () {
Navigator.pop(context);
},
onContinue: (deliveryType,billType ,shipment, cartonSizeType,
onContinue: (deliveryType, billType, shipment, cartonSizeType,
{standardSize, length, width, height}) {
setState(() {
_selectedDeliveryType = deliveryType;

2
lib/pages/carton/carton_size_widget.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:provider/provider.dart';
import '../../../domain/constants.dart';
import '../../constants.dart';
import '../../../domain/entities/carton_size.dart';
import '../../../domain/entities/fcs_shipment.dart';
import '../../../helpers/theme.dart';

2
lib/pages/carton/carton_submit.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:intl/intl.dart';
import '../../../domain/constants.dart';
import '../../constants.dart';
import '../../../domain/entities/cargo_type.dart';
import '../../../domain/entities/carton_size.dart';
import '../../../domain/entities/fcs_shipment.dart';

2
lib/pages/carton/mix_carton/mix_carton_editor.dart
View File

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import '../../../domain/constants.dart';
import '../../../constants.dart';
import '../../../domain/entities/carton.dart';
import '../../../domain/entities/carton_size.dart';
import '../../../domain/entities/fcs_shipment.dart';

2
lib/pages/carton/mix_carton/mix_carton_form.dart
View File

@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import '../../../domain/constants.dart';
import '../../../constants.dart';
import '../../../domain/entities/carton.dart';
import '../../../domain/entities/carton_size.dart';
import '../../../domain/entities/fcs_shipment.dart';

2
lib/pages/carton/mix_carton/mix_carton_submit.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:intl/intl.dart';
import '../../../domain/constants.dart';
import '../../../constants.dart';
import '../../../domain/entities/cargo_type.dart';
import '../../../domain/entities/carton.dart';
import '../../../domain/entities/carton_size.dart';

2
lib/pages/carton/mix_carton/type_widget.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:provider/provider.dart';
import '../../../domain/constants.dart';
import '../../../constants.dart';
import '../../../domain/entities/carton_size.dart';
import '../../../domain/entities/fcs_shipment.dart';
import '../../../helpers/theme.dart';

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

@@ -3,7 +3,7 @@ import 'dart:io';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/fcs_shipment.dart';
import 'package:fcs/pages/main/model/base_model.dart';
@@ -17,7 +17,7 @@ import 'package:path/path.dart' as Path;
class CartonModel extends BaseModel {
final log = Logger('CartonModel');
var defaultShipment =FcsShipment(shipmentNumber: "All shipments", id: all);
var defaultShipment = FcsShipment(shipmentNumber: "All shipments", id: all);
PaginatorListener<Carton>? cartonsByFilter;
PaginatorListener<Carton>? getBoxes;

2
lib/pages/carton/model/carton_selection_model.dart
View File

@@ -4,7 +4,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/domain/entities/carton.dart';
import 'package:logging/logging.dart';
import '../../../domain/constants.dart';
import '../../../constants.dart';
import '../../main/model/base_model.dart';
class CartonSelectionModel extends BaseModel {

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

@@ -5,7 +5,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/config.dart';
import 'package:logging/logging.dart';
import '../../../domain/constants.dart';
import '../../../constants.dart';
import '../../../domain/entities/user.dart';
import '../../../helpers/api_helper.dart';
import '../../../helpers/firebase_helper.dart';

2
lib/pages/carton/model/package_selection_model.dart
View File

@@ -3,7 +3,7 @@ import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:logging/logging.dart';
import '../../../domain/constants.dart';
import '../../../constants.dart';
import '../../../domain/entities/package.dart';
import '../../main/model/base_model.dart';

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

@@ -5,7 +5,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:logging/logging.dart';
import '../../../config.dart';
import '../../../domain/constants.dart';
import '../../../constants.dart';
import '../../../domain/entities/user.dart';
import '../../../helpers/api_helper.dart';
import '../../../helpers/firebase_helper.dart';

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

@@ -4,7 +4,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/domain/entities/fcs_shipment.dart';
import 'package:logging/logging.dart';
import '../../../domain/constants.dart';
import '../../../constants.dart';
import '../../main/model/base_model.dart';
class ShipmentSelectionModel extends BaseModel {
@@ -39,7 +39,7 @@ class ShipmentSelectionModel extends BaseModel {
Query query = FirebaseFirestore.instance
.collection(path)
.where("status", whereIn: [
fcs_shipment_processing_status,
fcs_shipment_processed_status,
fcs_shipment_shipped_status,
fcs_shipment_arrived_status,
fcs_shipment_invoiced_status

2
lib/pages/carton_size/model/carton_size_model.dart
View File

@@ -1,7 +1,7 @@
import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/carton_size.dart';
import 'package:fcs/helpers/firebase_helper.dart';
import 'package:fcs/pages/main/model/base_model.dart';

2
lib/pages/chat/message_detail.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/shipment.dart';
import 'package:fcs/domain/entities/user.dart';

2
lib/pages/chat/model/message_model.dart
View File

@@ -2,7 +2,7 @@ import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/vo/message.dart';
import 'package:fcs/pages/main/model/base_model.dart';
import 'package:logging/logging.dart';

2
lib/pages/customer/customer_editor.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/chat/message_detail.dart';

2
lib/pages/customer/customer_list.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/chat/message_detail.dart';

2
lib/pages/customer/model/customer_model.dart
View File

@@ -2,7 +2,7 @@ import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/pages/main/model/base_model.dart';
import 'package:logging/logging.dart';

2
lib/pages/delivery/delivery_info.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/vo/delivery_address.dart';

2
lib/pages/delivery/model/delivery_model.dart
View File

@@ -2,7 +2,7 @@ import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/pages/main/model/base_model.dart';
import 'package:logging/logging.dart';

2
lib/pages/delivery_address/model/delivery_address_model.dart
View File

@@ -3,7 +3,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/vo/delivery_address.dart';
import 'package:fcs/pages/main/model/base_model.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:logging/logging.dart';
class DeliveryAddressModel extends BaseModel {

2
lib/pages/discount/model/discount_model.dart
View File

@@ -2,7 +2,7 @@ import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/discount.dart';
import 'package:fcs/helpers/paginator.dart';
import 'package:fcs/pages/main/model/base_model.dart';

4
lib/pages/faq/faq_edit_page.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/faq.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/faq/model/faq_model.dart';
@@ -61,7 +61,7 @@ class _FAQEditorState extends State<FAQEditor> {
textInputType: TextInputType.number,
autovalidateMode: AutovalidateMode.onUserInteraction,
validator: (value) {
if (value == null || value.isEmpty || value.length==0) {
if (value == null || value.isEmpty || value.length == 0) {
return "Please insert S/N";
}

2
lib/pages/faq/faq_list_page.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/faq.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/buying_instruction/buying_online.dart';

4
lib/pages/fcs_shipment/fcs_shipment_info.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/fcs_shipment.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/fcs_shipment/model/fcs_shipment_model.dart';
@@ -219,7 +219,7 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
? Container(
padding: EdgeInsets.only(top: 3), child: cancelBtn)
: Container(),
_fcsShipment?.status == fcs_shipment_processing_status
_fcsShipment?.status == fcs_shipment_processed_status
? shipBtn
: Container(),
_fcsShipment?.status == fcs_shipment_shipped_status

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

@@ -2,7 +2,7 @@ import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/fcs_shipment.dart';
import 'package:fcs/pages/main/model/base_model.dart';
import 'package:logging/logging.dart';
@@ -41,9 +41,9 @@ class FcsShipmentModel extends BaseModel {
// processing status
if (index == 2) {
col = col.where("status", isEqualTo: fcs_shipment_processing_status);
col = col.where("status", isEqualTo: fcs_shipment_processed_status);
pageQuery =
pageQuery.where("status", isEqualTo: fcs_shipment_processing_status);
pageQuery.where("status", isEqualTo: fcs_shipment_processed_status);
}
// shipped status
@@ -87,7 +87,7 @@ class FcsShipmentModel extends BaseModel {
try {
var snaps = await FirebaseFirestore.instance
.collection("/$fcs_shipment_collection")
.where("status", isEqualTo: fcs_shipment_processing_status)
.where("status", isEqualTo: fcs_shipment_processed_status)
.get(const GetOptions(source: Source.server));
fcsShipments = snaps.docs.map((documentSnapshot) {
var fcs =
@@ -176,23 +176,28 @@ class FcsShipmentModel extends BaseModel {
}
Future<void> process(String id) {
return Services.instance.fcsShipmentService.processFcsShipment(id);
return Services.instance.fcsShipmentService
.updateFcsShipmentStatus(id, fcs_shipment_processed_status);
}
Future<void> ship(String id) {
return Services.instance.fcsShipmentService.shipFcsShipment(id);
return Services.instance.fcsShipmentService
.updateFcsShipmentStatus(id, fcs_shipment_shipped_status);
}
Future<void> arrive(String id) {
return Services.instance.fcsShipmentService.arriveFcsShipment(id);
return Services.instance.fcsShipmentService
.updateFcsShipmentStatus(id, fcs_shipment_arrived_status);
}
Future<void> invoice(String id) {
return Services.instance.fcsShipmentService.invoiceFcsShipment(id);
return Services.instance.fcsShipmentService
.updateFcsShipmentStatus(id, fcs_shipment_shipped_status);
}
Future<void> cancel(String id) {
return Services.instance.fcsShipmentService.cancelFcsShipment(id);
return Services.instance.fcsShipmentService
.updateFcsShipmentStatus(id, fcs_shipment_canceled_status);
}
Future<String> report(FcsShipment fcsShipment) {
@@ -205,7 +210,7 @@ class FcsShipmentModel extends BaseModel {
var snaps = await FirebaseFirestore.instance
.collection("/$fcs_shipment_collection")
.where("status", whereIn: [
fcs_shipment_processing_status,
fcs_shipment_processed_status,
fcs_shipment_shipped_status,
fcs_shipment_arrived_status,
fcs_shipment_invoiced_status

2
lib/pages/invoice/invoice_info.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/invoice.dart';
import 'package:fcs/helpers/theme.dart';

2
lib/pages/invoice/invoice_list_row.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/invoice.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/invoice/invoice_info.dart';

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

@@ -3,7 +3,7 @@ import 'dart:io';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/invoice.dart';
import 'package:fcs/domain/entities/payment.dart';
import 'package:fcs/helpers/firebase_helper.dart';

2
lib/pages/invoice/payment/payment_page.dart
View File

@@ -1,6 +1,6 @@
import 'dart:io';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/invoice.dart';
import 'package:fcs/domain/entities/payment.dart';
import 'package:fcs/helpers/theme.dart';

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

@@ -1,7 +1,7 @@
import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/market.dart';
import 'package:fcs/helpers/firebase_helper.dart';
import 'package:fcs/pages/main/model/base_model.dart';

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

@@ -3,7 +3,7 @@ import 'dart:io';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/domain/vo/delivery_address.dart';

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

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/vo/delivery_address.dart';
import 'package:fcs/helpers/theme.dart';
@@ -179,11 +179,11 @@ class _PackageInfoState extends State<PackageInfo> {
widget.isSearchResult
? Container()
: Padding(
padding: const EdgeInsets.only(top: 15),
child: StatusTree(
shipmentHistory: _package!.shipmentHistory,
currentStatus: _package!.status),
),
padding: const EdgeInsets.only(top: 15),
child: StatusTree(
shipmentHistory: _package!.shipmentHistory,
currentStatus: _package!.status),
),
SizedBox(
height: 20,
)

2
lib/pages/pickup/model/pickup_model.dart
View File

@@ -3,7 +3,7 @@ import 'dart:io';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/pickup.dart';
import 'package:fcs/helpers/firebase_helper.dart';
import 'package:fcs/pages/main/model/base_model.dart';

2
lib/pages/processing/package_editor.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/market.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/user.dart';

2
lib/pages/shipment/model/shipment_model.dart
View File

@@ -2,7 +2,7 @@ import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/shipment.dart';
import 'package:fcs/helpers/paginator.dart';
import 'package:fcs/pages/main/model/base_model.dart';

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

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/shipment.dart';
import 'package:fcs/domain/vo/delivery_address.dart';

2
lib/pages/shipment/shipment_info.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/shipment.dart';
import 'package:fcs/helpers/theme.dart';

8
lib/pages/staff/model/staff_model.dart
View File

@@ -2,7 +2,7 @@ import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/domain/vo/privilege.dart';
import 'package:fcs/helpers/firebase_helper.dart';
@@ -83,11 +83,7 @@ class StaffModel extends BaseModel {
required bool enablePin,
required int? pin}) async {
await request("/employee/pin", "PUT",
payload: {
"id": userID,
"enable_pin_login": enablePin,
"pin": pin
},
payload: {"id": userID, "enable_pin_login": enablePin, "pin": pin},
token: await getToken());
}

5
lib/pages/widgets/status_tree.dart
View File

@@ -1,4 +1,4 @@
import 'package:fcs/domain/constants.dart';
import 'package:fcs/constants.dart';
import 'package:fcs/domain/vo/shipment_status.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:flutter/material.dart';
@@ -19,7 +19,8 @@ class StatusTree extends StatelessWidget {
Widget build(BuildContext context) {
return ExpansionTile(
initiallyExpanded: true,
shape: Border.symmetric(horizontal: BorderSide(color: Colors.grey.shade300)),
shape:
Border.symmetric(horizontal: BorderSide(color: Colors.grey.shade300)),
title: Text(
'Status',
style: TextStyle(color: primaryColor, fontWeight: FontWeight.bold),