إضافة الهوية الجديدة Tripz
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/views/widgets/mycircular.dart';
|
||||
import 'package:siro_service/constant/links.dart';
|
||||
import 'package:siro_service/controller/functions/crud.dart';
|
||||
import 'package:siro_service/controller/functions/device_helper.dart';
|
||||
import 'package:siro_service/print.dart';
|
||||
import 'package:tripz_service/views/widgets/mycircular.dart';
|
||||
import 'package:tripz_service/constant/links.dart';
|
||||
import 'package:tripz_service/controller/functions/crud.dart';
|
||||
import 'package:tripz_service/controller/functions/device_helper.dart';
|
||||
import 'package:tripz_service/print.dart';
|
||||
|
||||
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'dart:io';
|
||||
import 'package:firebase_messaging/firebase_messaging.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/controller/local_notification.dart';
|
||||
import 'package:tripz_service/controller/local_notification.dart';
|
||||
import '../../constant/box_name.dart';
|
||||
import '../../main.dart';
|
||||
import '../../print.dart';
|
||||
|
||||
@@ -3,7 +3,7 @@ import 'dart:io';
|
||||
import 'package:firebase_messaging/firebase_messaging.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/views/widgets/mycircular.dart';
|
||||
import 'package:tripz_service/views/widgets/mycircular.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
|
||||
import '../../constant/api_key.dart';
|
||||
|
||||
@@ -5,14 +5,14 @@ import 'dart:io';
|
||||
import 'package:crypto/crypto.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:siro_service/constant/box_name.dart';
|
||||
import 'package:siro_service/constant/links.dart';
|
||||
import 'package:siro_service/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:siro_service/env/env.dart';
|
||||
import 'package:siro_service/controller/functions/security_helper.dart';
|
||||
import 'package:siro_service/controller/functions/session_manager.dart';
|
||||
import 'package:siro_service/main.dart';
|
||||
import 'package:siro_service/print.dart';
|
||||
import 'package:tripz_service/constant/box_name.dart';
|
||||
import 'package:tripz_service/constant/links.dart';
|
||||
import 'package:tripz_service/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:tripz_service/env/env.dart';
|
||||
import 'package:tripz_service/controller/functions/security_helper.dart';
|
||||
import 'package:tripz_service/controller/functions/session_manager.dart';
|
||||
import 'package:tripz_service/main.dart';
|
||||
import 'package:tripz_service/print.dart';
|
||||
|
||||
import '../../constant/api_key.dart';
|
||||
import 'ssl_pinning.dart';
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import 'dart:io';
|
||||
import 'package:device_info_plus/device_info_plus.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:siro_service/constant/box_name.dart';
|
||||
import 'package:siro_service/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:tripz_service/constant/box_name.dart';
|
||||
import 'package:tripz_service/controller/functions/encrypt_decrypt.dart';
|
||||
import '../../main.dart';
|
||||
import '../../print.dart';
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'package:encrypt/encrypt.dart' as encrypt;
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:siro_service/env/env.dart';
|
||||
import 'package:tripz_service/env/env.dart';
|
||||
|
||||
import 'package:secure_string_operations/secure_string_operations.dart';
|
||||
import 'package:siro_service/constant/char_map.dart';
|
||||
import 'package:siro_service/print.dart';
|
||||
import 'package:tripz_service/constant/char_map.dart';
|
||||
import 'package:tripz_service/print.dart';
|
||||
|
||||
|
||||
class EncryptionHelper {
|
||||
|
||||
@@ -15,8 +15,8 @@ import '../../constant/box_name.dart';
|
||||
import '../../constant/colors.dart';
|
||||
import '../../views/widgets/mycircular.dart';
|
||||
import '../../main.dart';
|
||||
import 'package:siro_service/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:siro_service/env/env.dart';
|
||||
import 'package:tripz_service/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:tripz_service/env/env.dart';
|
||||
|
||||
|
||||
class ImageController extends GetxController {
|
||||
|
||||
@@ -1,17 +1,3 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:jwt_decoder/jwt_decoder.dart';
|
||||
import 'package:secure_string_operations/secure_string_operations.dart';
|
||||
import 'package:siro_service/controller/functions/crud.dart';
|
||||
|
||||
import '../../constant/box_name.dart';
|
||||
import '../../constant/char_map.dart';
|
||||
import '../../constant/info.dart';
|
||||
import '../../constant/links.dart';
|
||||
import '../../env/env.dart';
|
||||
import '../../main.dart';
|
||||
import '../../print.dart';
|
||||
|
||||
class AppInitializer {
|
||||
List<Map<String, dynamic>> links = [];
|
||||
|
||||
@@ -28,16 +14,4 @@ class AppInitializer {
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
getAIKey(String key1) async {
|
||||
if (box.read(BoxName.firstTimeLoadKey) == null) {
|
||||
var res =
|
||||
await CRUD().get(link: Env.getapiKey, payload: {"keyName": key1});
|
||||
if (res != 'failure') {
|
||||
var d = res['message'];
|
||||
await storage.write(key: key1, value: d[key1].toString());
|
||||
await Future.delayed(Duration.zero);
|
||||
} else {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
import 'dart:io';
|
||||
import 'package:siro_service/main.dart';
|
||||
import 'package:tripz_service/main.dart';
|
||||
|
||||
String _formatPhoneNumberForCommunication(String rawPhone, String country) {
|
||||
String digits = rawPhone.replaceAll(RegExp(r'[^0-9]'), '');
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:siro_service/print.dart';
|
||||
import 'package:tripz_service/print.dart';
|
||||
|
||||
class SecurityHelper {
|
||||
static const platform = MethodChannel('com.service_siro/security');
|
||||
static const platform = MethodChannel('com.service_tripz/security');
|
||||
|
||||
static Future<String?> getAppSignature() async {
|
||||
try {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/constant/box_name.dart';
|
||||
import 'package:siro_service/controller/functions/crud.dart';
|
||||
import 'package:siro_service/main.dart';
|
||||
import 'package:siro_service/print.dart';
|
||||
import 'package:siro_service/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:siro_service/env/env.dart';
|
||||
import 'package:tripz_service/constant/box_name.dart';
|
||||
import 'package:tripz_service/controller/functions/crud.dart';
|
||||
import 'package:tripz_service/main.dart';
|
||||
import 'package:tripz_service/print.dart';
|
||||
import 'package:tripz_service/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:tripz_service/env/env.dart';
|
||||
/// مدير الجلسة - مسؤول عن مراقبة صلاحية الجلسة
|
||||
/// وتجديدها تلقائياً عند انتهائها
|
||||
class SessionManager extends GetxController {
|
||||
|
||||
@@ -8,11 +8,11 @@ class SslPinning {
|
||||
SslPinning._();
|
||||
|
||||
static final Map<String, List<String>> _pins = {
|
||||
'intaleq.xyz': [
|
||||
'tripz.xyz': [
|
||||
'/tNRUeeLxUhQU5gbgdpVWC6QBGAqc/ujg8Kcf0wQiAM=',
|
||||
'Hlx/0EWNDH5Xkt2KzvqxUzbw0vvEsyZSlibialSyGqI=',
|
||||
],
|
||||
'siromove.com': [
|
||||
'tripzmove.com': [
|
||||
'C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHESsl=',
|
||||
'diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=',
|
||||
],
|
||||
|
||||
@@ -596,7 +596,7 @@ final Map<String, String> ar_eg = {
|
||||
"Sign In by Google": "Sign In by Google",
|
||||
"Sign Out": "Sign Out",
|
||||
"Sign in with Google for easier email and name entry": "Sign in with Google for easier email and name entry",
|
||||
"Siro Service": "سيرو سيرفس",
|
||||
"Tripz Service": "تريبز سيرفس",
|
||||
"Sky Blue": "أزرق سماوي",
|
||||
"So go and gain your money": "So go and gain your money",
|
||||
"Speed Over": "Speed Over",
|
||||
|
||||
@@ -596,7 +596,7 @@ final Map<String, String> ar_jo = {
|
||||
"Sign In by Google": "Sign In by Google",
|
||||
"Sign Out": "Sign Out",
|
||||
"Sign in with Google for easier email and name entry": "Sign in with Google for easier email and name entry",
|
||||
"Siro Service": "سيرو سيرفس",
|
||||
"Tripz Service": "تريبز سيرفس",
|
||||
"Sky Blue": "أزرق سماوي",
|
||||
"So go and gain your money": "So go and gain your money",
|
||||
"Speed Over": "Speed Over",
|
||||
|
||||
@@ -596,7 +596,7 @@ final Map<String, String> ar_sy = {
|
||||
"Sign In by Google": "Sign In by Google",
|
||||
"Sign Out": "Sign Out",
|
||||
"Sign in with Google for easier email and name entry": "Sign in with Google for easier email and name entry",
|
||||
"Siro Service": "سيرو سيرفس",
|
||||
"Tripz Service": "تريبز سيرفس",
|
||||
"Sky Blue": "أزرق سماوي",
|
||||
"So go and gain your money": "So go and gain your money",
|
||||
"Speed Over": "Speed Over",
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/constant/links.dart';
|
||||
import 'package:siro_service/controller/functions/crud.dart';
|
||||
import 'package:siro_service/controller/functions/device_helper.dart';
|
||||
import 'package:siro_service/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:tripz_service/constant/links.dart';
|
||||
import 'package:tripz_service/controller/functions/crud.dart';
|
||||
import 'package:tripz_service/controller/functions/device_helper.dart';
|
||||
import 'package:tripz_service/controller/functions/encrypt_decrypt.dart';
|
||||
|
||||
import '../constant/box_name.dart';
|
||||
import '../main.dart';
|
||||
|
||||
@@ -2,12 +2,12 @@ import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/constant/colors.dart';
|
||||
import 'package:siro_service/constant/links.dart';
|
||||
import 'package:siro_service/controller/functions/crud.dart';
|
||||
import 'package:siro_service/controller/mainController/pages/driver_page.dart';
|
||||
import 'package:siro_service/main.dart';
|
||||
import 'package:siro_service/views/widgets/my_dialog.dart';
|
||||
import 'package:tripz_service/constant/colors.dart';
|
||||
import 'package:tripz_service/constant/links.dart';
|
||||
import 'package:tripz_service/controller/functions/crud.dart';
|
||||
import 'package:tripz_service/controller/mainController/pages/driver_page.dart';
|
||||
import 'package:tripz_service/main.dart';
|
||||
import 'package:tripz_service/views/widgets/my_dialog.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
import '../../print.dart';
|
||||
@@ -51,7 +51,7 @@ class MainController extends GetxController {
|
||||
void onInit() {
|
||||
super.onInit();
|
||||
final country = box.read('countryCode')?.toString() ?? 'Jordan';
|
||||
Log.print('🌍 [SIRO-SERVICE-STARTUP] Current countryCode stored in box: $country');
|
||||
Log.print('🌍 [TRIPZ-SERVICE-STARTUP] Current countryCode stored in box: $country');
|
||||
}
|
||||
|
||||
Future<void> refreshDashboardStats() async {
|
||||
|
||||
@@ -2,9 +2,9 @@ import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:siro_service/constant/style.dart';
|
||||
import 'package:siro_service/controller/functions/launch.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/constant/style.dart';
|
||||
import 'package:tripz_service/controller/functions/launch.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
import '../../../constant/colors.dart';
|
||||
import '../../../constant/links.dart';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
import '../../best_driver_controllers.dart';
|
||||
import '../../functions/encrypt_decrypt.dart';
|
||||
|
||||
@@ -2,9 +2,9 @@ import 'dart:convert';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/views/widgets/mycircular.dart';
|
||||
import 'package:siro_service/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/views/widgets/mycircular.dart';
|
||||
import 'package:tripz_service/controller/functions/encrypt_decrypt.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
import '../../../constant/colors.dart';
|
||||
import '../../../constant/links.dart';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
class Complaint extends StatelessWidget {
|
||||
const Complaint({super.key});
|
||||
|
||||
@@ -196,7 +196,7 @@ class DriverPage extends StatelessWidget {
|
||||
onTap: () => mainController.launchCommunication(
|
||||
'whatsapp',
|
||||
phone,
|
||||
'أهلاً بك يا كابتن $name في سيرو! تم تفعيل حسابك بنجاح وأصبحت مستعداً لاستقبال الرحلات.',
|
||||
'أهلاً بك يا كابتن $name في تريبز! تم تفعيل حسابك بنجاح وأصبحت مستعداً لاستقبال الرحلات.',
|
||||
),
|
||||
),
|
||||
CupertinoListTile(
|
||||
@@ -214,7 +214,7 @@ class DriverPage extends StatelessWidget {
|
||||
onTap: () => mainController.launchCommunication(
|
||||
'whatsapp',
|
||||
phone,
|
||||
'مرحباً كابتن $name، معك الدعم الفني من شركة سيرو. كيف يمكنني مساعدتك اليوم؟',
|
||||
'مرحباً كابتن $name، معك الدعم الفني من شركة تريبز. كيف يمكنني مساعدتك اليوم؟',
|
||||
),
|
||||
),
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/constant/colors.dart';
|
||||
import 'package:siro_service/controller/mainController/main_controller.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:siro_service/main.dart';
|
||||
import 'package:siro_service/constant/box_name.dart';
|
||||
import 'package:tripz_service/constant/colors.dart';
|
||||
import 'package:tripz_service/controller/mainController/main_controller.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/main.dart';
|
||||
import 'package:tripz_service/constant/box_name.dart';
|
||||
|
||||
import 'review_driver_page.dart';
|
||||
|
||||
@@ -129,12 +129,12 @@ class DriversCantRegister extends StatelessWidget {
|
||||
color: const Color(0xFF25D366),
|
||||
onPressed: () {
|
||||
String message = "مرحباً،\n\n"
|
||||
"يظهر لدينا في نظام تطبيق *سيرو* أنك لم تكمل عملية التسجيل بعد.\n"
|
||||
"يظهر لدينا في نظام تطبيق *تريبز* أنك لم تكمل عملية التسجيل بعد.\n"
|
||||
"ندعوك لإكمال التسجيل للاستفادة من مزايا التطبيق والبدء بالعمل معنا.\n\n"
|
||||
"إذا احتجت لأي مساعدة، تواصل معنا على خدمة العملاء:\n"
|
||||
"+963 952 475 742\n\n"
|
||||
"+963 952 475 740\n\n"
|
||||
"فريق سيرو يتمنى لك يوماً سعيداً.";
|
||||
"فريق تريبز يتمنى لك يوماً سعيداً.";
|
||||
|
||||
mainController.launchCommunication(
|
||||
'whatsapp',
|
||||
|
||||
@@ -2,8 +2,8 @@ import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:siro_service/controller/mainController/main_controller.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/controller/mainController/main_controller.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
import '../../../constant/colors.dart';
|
||||
import '../../../constant/links.dart';
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/constant/style.dart';
|
||||
import 'package:siro_service/controller/mainController/pages/edit_car.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/constant/style.dart';
|
||||
import 'package:tripz_service/controller/mainController/pages/edit_car.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
import '../../functions/encrypt_decrypt.dart';
|
||||
import '../main_controller.dart';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
import '../../best_driver_controllers.dart';
|
||||
import '../../functions/encrypt_decrypt.dart';
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/constant/colors.dart';
|
||||
import 'package:tripz_service/constant/colors.dart';
|
||||
// Importa tu nuevo controlador de servicio
|
||||
import 'package:siro_service/controller/mainController/ragister_service_controller.dart';
|
||||
import 'package:siro_service/views/widgets/elevated_btn.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/controller/mainController/ragister_service_controller.dart';
|
||||
import 'package:tripz_service/views/widgets/elevated_btn.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
// El import del antiguo controlador ya no es necesario
|
||||
// import '../registration_captain_controller.dart';
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/controller/mainController/main_controller.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/controller/mainController/main_controller.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
import '../../functions/encrypt_decrypt.dart';
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/constant/colors.dart';
|
||||
import 'package:siro_service/controller/mainController/main_controller.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/constant/colors.dart';
|
||||
import 'package:tripz_service/controller/mainController/main_controller.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
class PassengersPage extends StatelessWidget {
|
||||
PassengersPage({super.key});
|
||||
@@ -120,7 +120,7 @@ class PassengersPage extends StatelessWidget {
|
||||
onTap: () => mainController.launchCommunication(
|
||||
'whatsapp',
|
||||
phone,
|
||||
'مرحباً $name، معك الدعم الفني من شركة سيرو. كيف يمكنني مساعدتك اليوم؟',
|
||||
'مرحباً $name، معك الدعم الفني من شركة تريبز. كيف يمكنني مساعدتك اليوم؟',
|
||||
),
|
||||
isLast: true,
|
||||
),
|
||||
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/constant/colors.dart';
|
||||
import 'package:siro_service/views/widgets/elevated_btn.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/constant/colors.dart';
|
||||
import 'package:tripz_service/views/widgets/elevated_btn.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
import '../registration_captain_controller.dart';
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/constant/colors.dart';
|
||||
import 'package:siro_service/controller/mainController/review_driver_controller.dart';
|
||||
import 'package:siro_service/views/widgets/elevated_btn.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/constant/colors.dart';
|
||||
import 'package:tripz_service/controller/mainController/review_driver_controller.dart';
|
||||
import 'package:tripz_service/views/widgets/elevated_btn.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
class ReviewDriverPage extends StatelessWidget {
|
||||
const ReviewDriverPage({super.key});
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/views/widgets/mycircular.dart';
|
||||
import 'package:siro_service/constant/links.dart';
|
||||
import 'package:siro_service/controller/functions/crud.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/views/widgets/mycircular.dart';
|
||||
import 'package:tripz_service/constant/links.dart';
|
||||
import 'package:tripz_service/controller/functions/crud.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
/// --------------------------------------------------------------------------
|
||||
/// نموذج بيانات الرحلة
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/views/widgets/mycircular.dart';
|
||||
import 'package:siro_service/constant/colors.dart';
|
||||
import 'package:siro_service/constant/style.dart';
|
||||
import 'package:siro_service/views/widgets/elevated_btn.dart';
|
||||
import 'package:siro_service/views/widgets/my_scafold.dart';
|
||||
import 'package:tripz_service/views/widgets/mycircular.dart';
|
||||
import 'package:tripz_service/constant/colors.dart';
|
||||
import 'package:tripz_service/constant/style.dart';
|
||||
import 'package:tripz_service/views/widgets/elevated_btn.dart';
|
||||
import 'package:tripz_service/views/widgets/my_scafold.dart';
|
||||
|
||||
import '../main_controller.dart';
|
||||
|
||||
@@ -150,13 +150,13 @@ class DriverCard extends StatelessWidget {
|
||||
}
|
||||
|
||||
String message = "مرحباً،\n\n"
|
||||
"يعطيك العافية أستاذ. نرحب بك في شركة *سيرو* للنقل الذكي.\n"
|
||||
"يعطيك العافية أستاذ. نرحب بك في شركة *تريبز* للنقل الذكي.\n"
|
||||
"نود تعريفك بالتطبيق ومميزاته لتتمكن من الاستفادة الكاملة وبدء العمل معنا بسهولة.\n\n"
|
||||
"لأي استفسار أو مساعدة، يمكنك التواصل معنا على الأرقام التالية:\n\n"
|
||||
"+963 952 475 742\n"
|
||||
"+963 952 475 740\n"
|
||||
"+963 952 475 734\n\n"
|
||||
"فريق سيرو يتمنى لك تجربة موفقة ويوم سعيد.";
|
||||
"فريق تريبز يتمنى لك تجربة موفقة ويوم سعيد.";
|
||||
|
||||
Get.find<MainController>().launchCommunication(
|
||||
'whatsapp',
|
||||
|
||||
@@ -4,13 +4,13 @@ import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:siro_service/constant/box_name.dart';
|
||||
import 'package:siro_service/constant/links.dart';
|
||||
import 'package:siro_service/controller/functions/crud.dart';
|
||||
import 'package:siro_service/main.dart';
|
||||
import 'package:siro_service/print.dart';
|
||||
import 'package:siro_service/views/widgets/my_dialog.dart';
|
||||
import 'package:siro_service/views/widgets/mycircular.dart';
|
||||
import 'package:tripz_service/constant/box_name.dart';
|
||||
import 'package:tripz_service/constant/links.dart';
|
||||
import 'package:tripz_service/controller/functions/crud.dart';
|
||||
import 'package:tripz_service/main.dart';
|
||||
import 'package:tripz_service/print.dart';
|
||||
import 'package:tripz_service/views/widgets/my_dialog.dart';
|
||||
import 'package:tripz_service/views/widgets/mycircular.dart';
|
||||
|
||||
import 'pages/registration_captain_page.dart';
|
||||
|
||||
@@ -71,7 +71,7 @@ class RegisterCaptainServiceController extends GetxController {
|
||||
|
||||
void _initializeDocUrls() {
|
||||
const baseUrl =
|
||||
"https://syria.intaleq.xyz/siro/auth/syria/driversDocs/syria.intaleq.xyz-";
|
||||
"https://syria.tripz.xyz/tripz/auth/syria/driversDocs/syria.tripz.xyz-";
|
||||
docUrls['driver_license_front']!.value =
|
||||
"$baseUrl${driverId.value}-driver_license_front.jpg";
|
||||
docUrls['driver_license_back']!.value =
|
||||
|
||||
+8
-8
@@ -3,13 +3,13 @@ import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:siro_service/constant/box_name.dart';
|
||||
import 'package:siro_service/constant/links.dart';
|
||||
import 'package:siro_service/controller/functions/crud.dart';
|
||||
import 'package:siro_service/main.dart';
|
||||
import 'package:siro_service/print.dart';
|
||||
import 'package:siro_service/views/widgets/my_dialog.dart';
|
||||
import 'package:siro_service/views/widgets/mycircular.dart';
|
||||
import 'package:tripz_service/constant/box_name.dart';
|
||||
import 'package:tripz_service/constant/links.dart';
|
||||
import 'package:tripz_service/controller/functions/crud.dart';
|
||||
import 'package:tripz_service/main.dart';
|
||||
import 'package:tripz_service/print.dart';
|
||||
import 'package:tripz_service/views/widgets/my_dialog.dart';
|
||||
import 'package:tripz_service/views/widgets/mycircular.dart';
|
||||
|
||||
import 'pages/registration_captain_page.dart';
|
||||
|
||||
@@ -70,7 +70,7 @@ class RegisterCaptainController extends GetxController {
|
||||
|
||||
void _initializeDocUrls() {
|
||||
const baseUrl =
|
||||
"https://syria.intaleq.xyz/siro/auth/syria/driversDocs/syria.intaleq.xyz-";
|
||||
"https://syria.tripz.xyz/tripz/auth/syria/driversDocs/syria.tripz.xyz-";
|
||||
docUrls['driver_license_front']!.value =
|
||||
"$baseUrl${driverId.value}-driver_license_front.jpg";
|
||||
docUrls['driver_license_back']!.value =
|
||||
|
||||
@@ -2,10 +2,10 @@ import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:siro_service/constant/links.dart';
|
||||
import 'package:siro_service/controller/functions/crud.dart';
|
||||
import 'package:siro_service/main.dart';
|
||||
import 'package:siro_service/views/widgets/mycircular.dart';
|
||||
import 'package:tripz_service/constant/links.dart';
|
||||
import 'package:tripz_service/controller/functions/crud.dart';
|
||||
import 'package:tripz_service/main.dart';
|
||||
import 'package:tripz_service/views/widgets/mycircular.dart';
|
||||
|
||||
class ReviewDriverController extends GetxController {
|
||||
var isLoading = true.obs;
|
||||
@@ -252,7 +252,7 @@ class ReviewDriverController extends GetxController {
|
||||
|
||||
String reconstructDocumentUrl(String originalLink, String docType) {
|
||||
if (originalLink.isEmpty) {
|
||||
return "${AppLink.server}/auth/syria/driversDocs/syria.intaleq.xyz-${driverId.value}-$docType.jpg";
|
||||
return "${AppLink.server}/auth/syria/driversDocs/syria.tripz.xyz-${driverId.value}-$docType.jpg";
|
||||
}
|
||||
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user