Hamza/Siro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 2026-08-07 14:20:27

Browse Source
This commit is contained in:
Hamza-Ayed
2026-08-07 14:20:27 +03:00
parent 9e186f9ff3
commit b2a95c53aa
13 changed files with 343 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
siro_rider/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart
+38 -23
View File
@@ -120,34 +120,49 @@ class CashConfirmPageShown extends StatelessWidget {
}
// في كل الحالات الأخرى (كاش، أو محفظة برصيد كافٍ)
else {
return Column(
return Row(
children: [
MyElevatedButton(
title: 'Confirm & Find a Ride'.tr,
onPressed: () {
// --- نفس منطقك القديم بالضبط ---
controller.changeCashConfirmPageShown();
// controller.isSearchingWindow = true;
controller.startSearchingForDriver();
// controller.update();
},
Expanded(
flex: 1,
child: MyElevatedButton(
title: 'Confirm & Find a Ride'.tr,
onPressed: () {
// --- نفس منطقك القديم بالضبط ---
controller.changeCashConfirmPageShown();
// controller.isSearchingWindow = true;
controller.startSearchingForDriver();
// controller.update();
},
),
),
const SizedBox(height: 6),
const SizedBox(width: 8),
// ‏مسار موازٍ لا بديل: الحجز لا يفتح نافذة بحث ولا
// ‏ينتظر سائقاً — يسجّل موعداً ويتولّاه الخادم.
// ‏ثانوي بصرياً عمداً: الرحلة الفورية تبقى الافتراض.
TextButton.icon(
onPressed: () {
controller.changeCashConfirmPageShown();
controller.scheduleRideForLater();
},
icon: Icon(Icons.schedule,
size: 18, color: AppColor.primaryColor),
label: Text(
'احجزها لوقت لاحق'.tr,
style: TextStyle(
color: AppColor.primaryColor,
fontWeight: FontWeight.w600),
Expanded(
flex: 1,
child: SizedBox(
height: 52,
child: TextButton.icon(
style: TextButton.styleFrom(
padding: const EdgeInsets.symmetric(horizontal: 4),
),
onPressed: () {
controller.changeCashConfirmPageShown();
controller.scheduleRideForLater();
},
icon: Icon(Icons.schedule,
size: 18, color: AppColor.primaryColor),
label: FittedBox(
child: Text(
'Schedule for Later'.tr,
style: TextStyle(
color: AppColor.primaryColor,
fontWeight: FontWeight.bold,
fontSize: 14),
),
),
),
),
),
],
siro_rider/lib/views/home/map_widget.dart/map_menu_widget.dart
+6
View File
@@ -10,6 +10,7 @@ import 'package:siro_rider/constant/style.dart';
import 'package:siro_rider/views/home/my_wallet/passenger_wallet.dart';
import 'package:siro_rider/views/home/profile/complaint_page.dart';
import 'package:siro_rider/views/home/profile/order_history.dart';
import 'package:siro_rider/views/scheduled/scheduled_rides_page.dart';
import 'package:siro_rider/views/home/profile/promos_passenger_page.dart';
import 'package:url_launcher/url_launcher.dart';
@@ -174,6 +175,11 @@ class MapMenuWidget extends StatelessWidget {
icon: Icons.history_rounded,
onTap: () => Get.to(() => const OrderHistory()),
),
MenuListItem(
title: 'Scheduled Rides'.tr,
icon: Icons.schedule_rounded,
onTap: () => Get.to(() => const ScheduledRidesPage()),
),
MenuListItem(
title: 'Promos'.tr,
icon: Icons.local_offer_outlined,