fix functional bugs

This commit is contained in:
2026-05-29 11:40:55 +03:00
parent 591265a7fc
commit 134ffdde60
50 changed files with 1086 additions and 771 deletions

View File

@@ -3,7 +3,7 @@ import 'scooter.dart';
class ScooterOrder {
final int id;
final int scooterId;
final Scooter? scooter;
final Scooter scooter;
final int? planId;
final ScooterPlan? plan;
final int clientId;
@@ -33,7 +33,7 @@ class ScooterOrder {
ScooterOrder({
required this.id,
required this.scooterId,
this.scooter,
required this.scooter,
this.planId,
this.plan,
required this.clientId,
@@ -65,7 +65,7 @@ class ScooterOrder {
return ScooterOrder(
id: json['id'] ?? 0,
scooterId: json['scooterId'] ?? 0,
scooter: json['scooter'] != null ? Scooter.fromJson(json['scooter']) : null,
scooter: Scooter.fromJson(json['scooter']),
planId: json['planId'],
plan: json['plan'] != null ? ScooterPlan.fromJson(json['plan']) : null,
clientId: json['clientId'] ?? 0,