Sign page: added user check for accepting notes of a delivery

This commit is contained in:
Dennis Nemec
2025-11-28 20:46:03 +01:00
parent 7ea9108f62
commit 0150614ef5
12 changed files with 289 additions and 315 deletions

View File

@ -13,7 +13,6 @@ import 'package:hl_lieferservice/model/car.dart';
import 'package:hl_lieferservice/model/delivery.dart';
import 'package:hl_lieferservice/model/tour.dart';
import 'package:hl_lieferservice/util.dart';
import 'package:hl_lieferservice/services/erpframe.dart';
import 'package:http/http.dart';
import '../../../../dto/basic_response.dart';
@ -23,20 +22,17 @@ import '../../../../dto/discount_update_response.dart';
import '../../../../dto/scan_response.dart';
import '../../../authentication/exceptions.dart';
class DeliveryInfoService extends ErpFrameService {
DeliveryInfoService({required super.config});
class DeliveryInfoService {
DeliveryInfoService();
Future<void> updateDelivery(Delivery delivery) async {
try {
var headers = {
"Content-Type": "application/json"
};
var headers = {"Content-Type": "application/json"};
headers.addAll(getSessionOrThrow());
debugPrint(getSessionOrThrow().toString());
debugPrint(jsonEncode(DeliveryUpdateDTO.fromEntity(delivery).toJson()));
var response = await post(
urlBuilder("_web_updateDelivery"),
headers: headers,
@ -70,9 +66,7 @@ class DeliveryInfoService extends ErpFrameService {
Future<void> assignCar(String deliveryId, String carId) async {
try {
var headers = {
"Content-Type": "application/json"
};
var headers = {"Content-Type": "application/json"};
headers.addAll(getSessionOrThrow());
var response = await post(
@ -87,7 +81,7 @@ class DeliveryInfoService extends ErpFrameService {
Map<String, dynamic> responseJson = jsonDecode(response.body);
DeliveryUpdateResponseDTO responseDto =
DeliveryUpdateResponseDTO.fromJson(responseJson);
DeliveryUpdateResponseDTO.fromJson(responseJson);
if (responseDto.code == "200") {
return;
@ -118,23 +112,29 @@ class DeliveryInfoService extends ErpFrameService {
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
DeliveryResponseDTO responseDto =
DeliveryResponseDTO.fromJson(jsonDecode(response.body));
DeliveryResponseDTO responseDto = DeliveryResponseDTO.fromJson(
jsonDecode(response.body),
);
return Tour(
discountArticleNumber: responseDto.discountArticleNumber,
date: DateTime.now(),
deliveries: responseDto.deliveries.map(Delivery.fromDTO).toList(),
paymentMethods: [],
driver: Driver(
cars: responseDto.driver.cars
.map((carDto) =>
Car(id: int.parse(carDto.id), plate: carDto.plate))
discountArticleNumber: responseDto.discountArticleNumber,
date: DateTime.now(),
deliveries: responseDto.deliveries.map(Delivery.fromDTO).toList(),
paymentMethods: [],
driver: Driver(
cars:
responseDto.driver.cars
.map(
(carDto) =>
Car(id: int.parse(carDto.id), plate: carDto.plate),
)
.toList(),
teamNumber: int.parse(responseDto.driver.id),
name: responseDto.driver.name,
salutation: responseDto.driver.salutation));
teamNumber: int.parse(responseDto.driver.id),
name: responseDto.driver.name,
salutation: responseDto.driver.salutation,
),
);
} catch (e, stacktrace) {
debugPrint(e.toString());
debugPrint(stacktrace.toString());
@ -157,8 +157,9 @@ class DeliveryInfoService extends ErpFrameService {
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
PaymentMethodListDTO responseDto =
PaymentMethodListDTO.fromJson(responseJson);
PaymentMethodListDTO responseDto = PaymentMethodListDTO.fromJson(
responseJson,
);
return responseDto.paymentMethods;
} catch (e, st) {
@ -171,7 +172,10 @@ class DeliveryInfoService extends ErpFrameService {
}
Future<String?> unscanArticle(
String internalId, int amount, String reason) async {
String internalId,
int amount,
String reason,
) async {
try {
var response = await post(
urlBuilder("_web_unscanArticle"),
@ -179,7 +183,7 @@ class DeliveryInfoService extends ErpFrameService {
body: {
"article_id": internalId,
"amount": amount.toString(),
"reason": reason
"reason": reason,
},
);
@ -234,7 +238,10 @@ class DeliveryInfoService extends ErpFrameService {
}
Future<DiscountAddResponseDTO> addDiscount(
String deliveryId, int discount, String note) async {
String deliveryId,
int discount,
String note,
) async {
try {
var response = await post(
urlBuilder("_web_addDiscount"),
@ -242,7 +249,7 @@ class DeliveryInfoService extends ErpFrameService {
body: {
"delivery_id": deliveryId,
"discount": discount.toString(),
"note": note
"note": note,
},
);
@ -268,9 +275,7 @@ class DeliveryInfoService extends ErpFrameService {
var response = await post(
urlBuilder("_web_removeDiscount"),
headers: getSessionOrThrow(),
body: {
"delivery_id": deliveryId,
},
body: {"delivery_id": deliveryId},
);
if (response.statusCode == HttpStatus.unauthorized) {
@ -291,16 +296,15 @@ class DeliveryInfoService extends ErpFrameService {
}
Future<DiscountUpdateResponseDTO> updateDiscount(
String deliveryId, String? note, int? discount) async {
String deliveryId,
String? note,
int? discount,
) async {
try {
var response = await post(
urlBuilder("_web_updateDiscount"),
headers: getSessionOrThrow(),
body: {
"delivery_id": deliveryId,
"discount": discount,
"note": note
},
body: {"delivery_id": deliveryId, "discount": discount, "note": note},
);
if (response.statusCode == HttpStatus.unauthorized) {
@ -336,9 +340,7 @@ class DeliveryInfoService extends ErpFrameService {
Map<String, dynamic> responseJson = jsonDecode(response.body);
debugPrint(responseJson.toString());
ScanResponseDTO responseDto = ScanResponseDTO.fromJson(
responseJson,
);
ScanResponseDTO responseDto = ScanResponseDTO.fromJson(responseJson);
if (responseDto.succeeded == true) {
return;