diff --git a/backend/core/bootstrap.php b/backend/core/bootstrap.php index a691ecab..7c241344 100644 --- a/backend/core/bootstrap.php +++ b/backend/core/bootstrap.php @@ -23,6 +23,13 @@ ini_set('log_errors', '1'); $logPath = getenv('ERROR_LOG_PATH') ?: (__DIR__ . '/../logs/php_errors.log'); ini_set('error_log', $logPath); +// تعريف الدولة أو البيئة الحالية للسيرفر (مثلاً: syria, egypt, jordan) +// تُستخدم لتوجيه الروابط أو لتحديد السيرفر +$globalCountry = getenv('GLOBAL_COUNTRY') ?: 'syria'; +if (!defined('GLOBAL_COUNTRY')) { + define('GLOBAL_COUNTRY', $globalCountry); +} + header_remove('X-Powered-By'); header('Content-Type: application/json; charset=UTF-8'); header('X-Content-Type-Options: nosniff'); diff --git a/backend/nabeh/verify_payment.php b/backend/nabeh/verify_payment.php new file mode 100644 index 00000000..c1794d4d --- /dev/null +++ b/backend/nabeh/verify_payment.php @@ -0,0 +1,50 @@ + 'error', 'message' => 'Failed to connect to Wallet Server']); +} + +echo $response; diff --git a/siro_rider/lib/views/auth/otp_page.dart b/siro_rider/lib/views/auth/otp_page.dart index 0a309df1..0b215761 100644 --- a/siro_rider/lib/views/auth/otp_page.dart +++ b/siro_rider/lib/views/auth/otp_page.dart @@ -9,6 +9,7 @@ import '../../controller/local/phone_intel/intl_phone_field.dart'; import '../../controller/functions/country_logic.dart'; import '../../constant/box_name.dart'; import '../../main.dart'; +import '../home/map_widget.dart/left_main_menu_icons.dart'; // ───────────────────────────────────────────────────────────────────────────── // SHARED DESIGN TOKENS @@ -488,7 +489,8 @@ class _PhoneNumberScreenState extends State { const BorderSide(color: Color(0xFFEF4444), width: 1.5), ), ), - initialCountryCode: CountryLogic.getCountryPrefix(box.read(BoxName.countryCode) ?? 'Syria'), + initialCountryCode: CountryLogic.getCountryPrefix( + box.read(BoxName.countryCode) ?? 'Syria'), onChanged: (phone) { _phoneController.text = phone.completeNumber; }, @@ -540,7 +542,8 @@ class _OtpVerificationScreenState extends State { void _submit() async { if (_formKey.currentState!.validate()) { setState(() => _isLoading = true); - await PhoneAuthHelper.verifyOtp(widget.phoneNumber, _otpController.text.trim()); + await PhoneAuthHelper.verifyOtp( + widget.phoneNumber, _otpController.text.trim()); if (mounted) setState(() => _isLoading = false); } } diff --git a/siro_rider/lib/views/home/map_widget.dart/car_details_widget_to_go.dart b/siro_rider/lib/views/home/map_widget.dart/car_details_widget_to_go.dart index c7683f01..549400e4 100644 --- a/siro_rider/lib/views/home/map_widget.dart/car_details_widget_to_go.dart +++ b/siro_rider/lib/views/home/map_widget.dart/car_details_widget_to_go.dart @@ -63,14 +63,18 @@ final Map _carTypeCatalog = { carType: 'Awfar Car', carDetail: 'Old and affordable'.tr, image: 'assets/images/balash.png'), + 'Mishwar Vip': CarType( + carType: 'Mishwar Vip', + carDetail: 'Perfect for passengers seeking the latest car models'.tr, + image: 'assets/images/jeep.png'), }; // ترتيب وتوفر أنواع السيارات حسب الدولة (بدون "Rayeh Gai" لأنها تُضاف // تلقائياً حسب مسافة الرحلة بغض النظر عن الدولة). const Map> _carTypesByCountry = { - 'Jordan': ['Fixed Price', 'Comfort', 'Electric', 'Lady'], - 'Egypt': ['Fixed Price', 'Comfort', 'Lady', 'Scooter', 'Awfar Car'], - 'Syria': ['Fixed Price', 'Comfort', 'Electric', 'Lady', 'Van'], + 'Jordan': ['Fixed Price', 'Comfort', 'Mishwar Vip', 'Electric', 'Lady'], + 'Egypt': ['Fixed Price', 'Comfort', 'Mishwar Vip', 'Lady', 'Scooter', 'Awfar Car'], + 'Syria': ['Fixed Price', 'Comfort', 'Mishwar Vip', 'Electric', 'Lady', 'Van'], }; List _carTypesForCountry(String country) { diff --git a/siro_rider/lib/views/home/map_widget.dart/left_main_menu_icons.dart b/siro_rider/lib/views/home/map_widget.dart/left_main_menu_icons.dart index 1dfe3115..1e2db03b 100644 --- a/siro_rider/lib/views/home/map_widget.dart/left_main_menu_icons.dart +++ b/siro_rider/lib/views/home/map_widget.dart/left_main_menu_icons.dart @@ -69,11 +69,11 @@ GetBuilder leftMainMenuIcons() { tooltip: 'VIP Waiting Page', onPressed: () => Get.to(() => VipWaittingPage()), ), - _buildMapActionButton( - icon: Icons.explore, - tooltip: 'Test Page', - onPressed: () => Get.to(() => TestPage()), - ), + // _buildMapActionButton( + // icon: Icons.explore, + // tooltip: 'Test Page', + // onPressed: () => Get.to(() => TestPage()), + // ), ], ), ),