diff --git a/siro_driver/lib/controller/auth/captin/login_captin_controller.dart b/siro_driver/lib/controller/auth/captin/login_captin_controller.dart index a1e6b8ff..ce0defa3 100755 --- a/siro_driver/lib/controller/auth/captin/login_captin_controller.dart +++ b/siro_driver/lib/controller/auth/captin/login_captin_controller.dart @@ -399,7 +399,8 @@ class LoginDriverController extends GetxController { } // updateAppTester(AppInformation.appName); - if (d['status'].toString() != 'yet') { + final driverStatus = d['status'].toString(); + if (driverStatus != 'yet' && driverStatus != 'pending_review') { var token = await CRUD().get( link: AppLink.getDriverToken, payload: { diff --git a/siro_driver/lib/controller/auth/syria/registration_controller.dart b/siro_driver/lib/controller/auth/syria/registration_controller.dart index edbffd36..f44691f9 100644 --- a/siro_driver/lib/controller/auth/syria/registration_controller.dart +++ b/siro_driver/lib/controller/auth/syria/registration_controller.dart @@ -11,6 +11,7 @@ import 'package:siro_driver/constant/links.dart'; import 'package:siro_driver/controller/firebase/notification_service.dart'; import '../../../constant/box_name.dart'; import 'package:path_provider/path_provider.dart'; + // --- Final Submission --- import 'package:path_provider/path_provider.dart' as path_provider; @@ -62,6 +63,7 @@ class RegistrationController extends GetxController { final phoneController = TextEditingController(); // You can pre-fill this final driverLicenseExpiryController = TextEditingController(); DateTime? driverLicenseExpiryDate; + final siteController = TextEditingController(); // المدينة/الموقع // STEP 2: Car Information Controllers final carPlateController = TextEditingController(); @@ -614,6 +616,7 @@ class RegistrationController extends GetxController { _addField(fields, 'email', generatedEmail); _addField(fields, 'gender', 'Male'); // يفضل ربطها بـ Dropdown أيضاً _addField(fields, 'country', box.read(BoxName.countryCode)?.toString() ?? 'Jordan'); + _addField(fields, 'site', siteController.text.isNotEmpty ? siteController.text : null); // --- Car Data --- _addField(fields, 'vin', carVinController.text.isNotEmpty ? carVinController.text : 'yet'); diff --git a/siro_driver/lib/views/auth/syria/registration_view.dart b/siro_driver/lib/views/auth/syria/registration_view.dart index 569cac86..cc4955c0 100644 --- a/siro_driver/lib/views/auth/syria/registration_view.dart +++ b/siro_driver/lib/views/auth/syria/registration_view.dart @@ -156,6 +156,21 @@ class RegistrationView extends StatelessWidget { }, ), const SizedBox(height: 16), + TextFormField( + controller: c.siteController, + decoration: InputDecoration( + labelText: 'City / Governorate'.tr, + hintText: 'e.g. Amman'.tr, + border: const OutlineInputBorder(), + ), + validator: (v) { + if (v == null || v.isEmpty) { + return 'Required field'.tr; + } + return null; + }, + ), + const SizedBox(height: 16), TextFormField( controller: c.driverLicenseExpiryController, decoration: InputDecoration(