some fix
# Conflicts: # lib/presentation/navigation/app_router.dart # pubspec.yaml
This commit is contained in:
@@ -1,154 +1,157 @@
|
||||
import 'scooter.dart';
|
||||
|
||||
class ScooterOrder {
|
||||
final int id;
|
||||
final int scooterId;
|
||||
final Scooter scooter;
|
||||
final int? planId;
|
||||
final ScooterPlan? plan;
|
||||
final int clientId;
|
||||
final int? subscriptionId;
|
||||
final int? cardId;
|
||||
final bool isBalance;
|
||||
final int decimals;
|
||||
final bool isInsurance;
|
||||
final double? insurancePrice;
|
||||
final String? insurancePricePrint;
|
||||
final double? holdPrice;
|
||||
final String? holdPricePrint;
|
||||
final double? totalPrice;
|
||||
final String? totalPricePrint;
|
||||
final int? currencyId;
|
||||
final String status;
|
||||
final DateTime createdAt;
|
||||
final DateTime? updatedAt;
|
||||
final DateTime? startAt;
|
||||
final DateTime? finishAt;
|
||||
final DateTime? expiresAt;
|
||||
final DateTime? cancelAt;
|
||||
final String? cancelDescription;
|
||||
final double mileage; //эту
|
||||
final double avgSpeed; //эту и снизу еще 4 есть
|
||||
final String payTotalPricePrint;
|
||||
final String unpayTotalPricePrint;
|
||||
final String totalOrderPricePrint;
|
||||
|
||||
ScooterOrder({
|
||||
required this.id,
|
||||
required this.scooterId,
|
||||
required this.scooter,
|
||||
this.planId,
|
||||
this.plan,
|
||||
required this.clientId,
|
||||
this.subscriptionId,
|
||||
this.cardId,
|
||||
required this.isBalance,
|
||||
required this.decimals,
|
||||
required this.isInsurance,
|
||||
this.insurancePrice,
|
||||
this.insurancePricePrint,
|
||||
this.holdPrice,
|
||||
this.holdPricePrint,
|
||||
this.totalPrice,
|
||||
this.totalPricePrint,
|
||||
this.currencyId,
|
||||
required this.status,
|
||||
required this.createdAt,
|
||||
this.updatedAt,
|
||||
this.startAt,
|
||||
this.finishAt,
|
||||
this.expiresAt,
|
||||
this.cancelAt,
|
||||
this.cancelDescription,
|
||||
required this.mileage,
|
||||
required this.avgSpeed,
|
||||
required this.payTotalPricePrint, // оплачено
|
||||
required this.unpayTotalPricePrint, //неоплачено
|
||||
required this.totalOrderPricePrint, //общая
|
||||
});
|
||||
|
||||
factory ScooterOrder.fromJson(Map<String, dynamic> json) {
|
||||
final paymentInfo = json['paymentInfo'] as Map<String, dynamic>?;
|
||||
|
||||
return ScooterOrder(
|
||||
id: json['id'] ?? 0,
|
||||
scooterId: json['scooterId'] ?? 0,
|
||||
scooter: Scooter.fromJson(json['scooter']),
|
||||
planId: json['planId'],
|
||||
plan: json['plan'] != null ? ScooterPlan.fromJson(json['plan']) : null,
|
||||
clientId: json['clientId'] ?? 0,
|
||||
subscriptionId: json['subscriptionId'],
|
||||
cardId: json['cardId'],
|
||||
isBalance: json['isBalance'] ?? false,
|
||||
decimals: json['decimals'] ?? 0,
|
||||
isInsurance: json['isInsurance'] ?? false,
|
||||
insurancePrice: (json['insurancePrice'] as num?)?.toDouble(),
|
||||
insurancePricePrint: json['insurancePricePrint'],
|
||||
holdPrice: (json['holdPrice'] as num?)?.toDouble(),
|
||||
holdPricePrint: json['holdPricePrint'],
|
||||
totalPrice: (json['totalPrice'] as num?)?.toDouble(),
|
||||
totalPricePrint: json['totalPricePrint'],
|
||||
currencyId: json['currencyId'],
|
||||
status: json['status'] ?? '',
|
||||
createdAt: json['createdAt'] != null
|
||||
? DateTime.parse(json['createdAt'])
|
||||
: DateTime.now(),
|
||||
updatedAt: json['updatedAt'] != null
|
||||
? DateTime.parse(json['updatedAt'])
|
||||
: null,
|
||||
startAt: json['startAt'] != null
|
||||
? DateTime.parse(json['startAt'])
|
||||
: null,
|
||||
finishAt: json['finishAt'] != null
|
||||
? DateTime.parse(json['finishAt'])
|
||||
: null,
|
||||
expiresAt: json['expiresAt'] != null
|
||||
? DateTime.parse(json['expiresAt'])
|
||||
: null,
|
||||
cancelAt: json['cancelAt'] != null
|
||||
? DateTime.parse(json['cancelAt'])
|
||||
: null,
|
||||
cancelDescription: json['cancelDescription'],
|
||||
mileage: (json['mileage'] as num?)?.toDouble() ?? 0.0,
|
||||
avgSpeed: (json['avgSpeed'] as num?)?.toDouble() ?? 0.0,
|
||||
payTotalPricePrint: paymentInfo?['payTotalPricePrint'] ?? '',
|
||||
unpayTotalPricePrint: paymentInfo?['unpayTotalPricePrint'] ?? '',
|
||||
totalOrderPricePrint: paymentInfo?['totalOrderPricePrint'] ?? '',
|
||||
);
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
return {
|
||||
'id': id,
|
||||
'scooterId': scooterId,
|
||||
'planId': planId,
|
||||
'subscriptionId': subscriptionId,
|
||||
'cardId': cardId,
|
||||
'isBalance': isBalance,
|
||||
'isInsurance': isInsurance,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
class ScooterPlan {
|
||||
final int id;
|
||||
final String title;
|
||||
final double price;
|
||||
final String? description;
|
||||
|
||||
ScooterPlan({
|
||||
required this.id,
|
||||
required this.title,
|
||||
required this.price,
|
||||
this.description,
|
||||
});
|
||||
|
||||
factory ScooterPlan.fromJson(Map<String, dynamic> json) {
|
||||
return ScooterPlan(
|
||||
id: json['id'] ?? 0,
|
||||
title: json['title'] ?? '',
|
||||
price: (json['price'] as num?)?.toDouble() ?? 0.0,
|
||||
description: json['description'],
|
||||
);
|
||||
}
|
||||
}
|
||||
import 'scooter.dart';
|
||||
|
||||
class ScooterOrder {
|
||||
final int id;
|
||||
final int scooterId;
|
||||
final Scooter scooter;
|
||||
final int? planId;
|
||||
final ScooterPlan? plan;
|
||||
final int clientId;
|
||||
final int? subscriptionId;
|
||||
final int? cardId;
|
||||
final bool isBalance;
|
||||
final int decimals;
|
||||
final bool isInsurance;
|
||||
final double? insurancePrice;
|
||||
final String? insurancePricePrint;
|
||||
final double? holdPrice;
|
||||
final String? holdPricePrint;
|
||||
final double? totalPrice;
|
||||
final String? totalPricePrint;
|
||||
final int? currencyId;
|
||||
final String status;
|
||||
final DateTime createdAt;
|
||||
final DateTime? updatedAt;
|
||||
final DateTime? startAt;
|
||||
final DateTime? finishAt;
|
||||
final DateTime? expiresAt;
|
||||
final DateTime? cancelAt;
|
||||
final String? cancelDescription;
|
||||
final double mileage;
|
||||
final double avgSpeed;
|
||||
final String payTotalPricePrint;
|
||||
final String unpayTotalPricePrint;
|
||||
final String totalOrderPricePrint;
|
||||
final bool hasFine;
|
||||
|
||||
ScooterOrder({
|
||||
required this.id,
|
||||
required this.scooterId,
|
||||
required this.scooter,
|
||||
this.planId,
|
||||
this.plan,
|
||||
required this.clientId,
|
||||
this.subscriptionId,
|
||||
this.cardId,
|
||||
required this.isBalance,
|
||||
required this.decimals,
|
||||
required this.isInsurance,
|
||||
this.insurancePrice,
|
||||
this.insurancePricePrint,
|
||||
this.holdPrice,
|
||||
this.holdPricePrint,
|
||||
this.totalPrice,
|
||||
this.totalPricePrint,
|
||||
this.currencyId,
|
||||
required this.status,
|
||||
required this.createdAt,
|
||||
this.updatedAt,
|
||||
this.startAt,
|
||||
this.finishAt,
|
||||
this.expiresAt,
|
||||
this.cancelAt,
|
||||
this.cancelDescription,
|
||||
required this.mileage,
|
||||
required this.avgSpeed,
|
||||
required this.payTotalPricePrint, // оплачено
|
||||
required this.unpayTotalPricePrint, //неоплачено
|
||||
required this.totalOrderPricePrint, //общая
|
||||
required this.hasFine,
|
||||
});
|
||||
|
||||
factory ScooterOrder.fromJson(Map<String, dynamic> json) {
|
||||
final paymentInfo = json['paymentInfo'] as Map<String, dynamic>?;
|
||||
|
||||
return ScooterOrder(
|
||||
id: json['id'] ?? 0,
|
||||
scooterId: json['scooterId'] ?? 0,
|
||||
scooter: Scooter.fromJson(json['scooter']),
|
||||
planId: json['planId'],
|
||||
plan: json['plan'] != null ? ScooterPlan.fromJson(json['plan']) : null,
|
||||
clientId: json['clientId'] ?? 0,
|
||||
subscriptionId: json['subscriptionId'],
|
||||
cardId: json['cardId'],
|
||||
isBalance: json['isBalance'] ?? false,
|
||||
decimals: json['decimals'] ?? 0,
|
||||
isInsurance: json['isInsurance'] ?? false,
|
||||
insurancePrice: (json['insurancePrice'] as num?)?.toDouble(),
|
||||
insurancePricePrint: json['insurancePricePrint'],
|
||||
holdPrice: (json['holdPrice'] as num?)?.toDouble(),
|
||||
holdPricePrint: json['holdPricePrint'],
|
||||
totalPrice: (json['totalPrice'] as num?)?.toDouble(),
|
||||
totalPricePrint: json['totalPricePrint'],
|
||||
currencyId: json['currencyId'],
|
||||
status: json['status'] ?? '',
|
||||
createdAt: json['createdAt'] != null
|
||||
? DateTime.parse(json['createdAt'])
|
||||
: DateTime.now(),
|
||||
updatedAt: json['updatedAt'] != null
|
||||
? DateTime.parse(json['updatedAt'])
|
||||
: null,
|
||||
startAt: json['startAt'] != null
|
||||
? DateTime.parse(json['startAt'])
|
||||
: null,
|
||||
finishAt: json['finishAt'] != null
|
||||
? DateTime.parse(json['finishAt'])
|
||||
: null,
|
||||
expiresAt: json['expiresAt'] != null
|
||||
? DateTime.parse(json['expiresAt'])
|
||||
: null,
|
||||
cancelAt: json['cancelAt'] != null
|
||||
? DateTime.parse(json['cancelAt'])
|
||||
: null,
|
||||
cancelDescription: json['cancelDescription'],
|
||||
mileage: (json['mileage'] as num?)?.toDouble() ?? 0.0,
|
||||
avgSpeed: (json['avgSpeed'] as num?)?.toDouble() ?? 0.0,
|
||||
payTotalPricePrint: paymentInfo?['payTotalPricePrint'] ?? '',
|
||||
unpayTotalPricePrint: paymentInfo?['unpayTotalPricePrint'] ?? '',
|
||||
totalOrderPricePrint: paymentInfo?['totalOrderPricePrint'] ?? '',
|
||||
hasFine: paymentInfo?['hasFine'] ?? false,
|
||||
);
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
return {
|
||||
'id': id,
|
||||
'scooterId': scooterId,
|
||||
'planId': planId,
|
||||
'subscriptionId': subscriptionId,
|
||||
'cardId': cardId,
|
||||
'isBalance': isBalance,
|
||||
'isInsurance': isInsurance,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
class ScooterPlan {
|
||||
final int id;
|
||||
final String title;
|
||||
final double price;
|
||||
final String? description;
|
||||
|
||||
ScooterPlan({
|
||||
required this.id,
|
||||
required this.title,
|
||||
required this.price,
|
||||
this.description,
|
||||
});
|
||||
|
||||
factory ScooterPlan.fromJson(Map<String, dynamic> json) {
|
||||
return ScooterPlan(
|
||||
id: json['id'] ?? 0,
|
||||
title: json['title'] ?? '',
|
||||
price: (json['price'] as num?)?.toDouble() ?? 0.0,
|
||||
description: json['description'],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user