6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 9a653b81
Changed files
common/pubspec.yaml | 3 +-- .../widgets/provide_location_action_bar.dart | 4 ++-- .../screens/review_order/widget/delivery_method_picker.dart | 3 +-- .../screens/review_order/widget/review_order_app_bar.dart | 12 +++++++++++- 4 files changed, 15 insertions(+), 7 deletions(-)
Diff
diff --git a/common/pubspec.yaml b/common/pubspec.yaml
index 54d06d10..37e464f7 100644
--- a/common/pubspec.yaml
+++ b/common/pubspec.yaml
@@ -4,8 +4,7 @@ version: 0.0.1
homepage:
environment:
- sdk: ^3.11.0
- flutter: ">=1.17.0"
+ sdk: '>=3.8.0 <4.0.0'
dependencies:
flutter:
diff --git a/concierge/lib/presentation/screens/provide_location/widgets/provide_location_action_bar.dart b/concierge/lib/presentation/screens/provide_location/widgets/provide_location_action_bar.dart
index dbffc3c9..22daad52 100644
--- a/concierge/lib/presentation/screens/provide_location/widgets/provide_location_action_bar.dart
+++ b/concierge/lib/presentation/screens/provide_location/widgets/provide_location_action_bar.dart
@@ -1,10 +1,10 @@
import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/app/cart_cubit.dart';
+import 'package:concierge/presentation/screens/confirm_order/confirm_order_route.dart';
import 'package:concierge/presentation/screens/provide_location/bloc/provide_location_cubit.dart';
import 'package:concierge/presentation/theme/app_colors.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
class ProvideLocationActionBar extends StatelessWidget {
const ProvideLocationActionBar({super.key});
@@ -31,7 +31,7 @@ class ProvideLocationActionBar extends StatelessWidget {
onPressed: () {
cubit.onConfirmClicked();
cartCubit.updateDelivery(true);
- context.pop();
+ ConfirmOrderRoute().push(context);
},
child: Text(
context.strings.confirm_location,
diff --git a/concierge/lib/presentation/screens/review_order/widget/delivery_method_picker.dart b/concierge/lib/presentation/screens/review_order/widget/delivery_method_picker.dart
index b3e02f9a..8c8a2a59 100644
--- a/concierge/lib/presentation/screens/review_order/widget/delivery_method_picker.dart
+++ b/concierge/lib/presentation/screens/review_order/widget/delivery_method_picker.dart
@@ -1,6 +1,5 @@
import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/app/cart_cubit.dart';
-import 'package:concierge/presentation/screens/provide_location/provide_location_route.dart';
import 'package:concierge/presentation/theme/app_colors.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -20,7 +19,7 @@ class DeliveryMethodPicker extends StatelessWidget {
context,
isSelected: cartCubit.state.isDelivery,
onClick: () {
- ProvideLocationRoute().push(context);
+ cartCubit.updateDelivery(true);
},
text: "${context.strings.delivery} | $deliveryPrice kr.",
),
diff --git a/concierge/lib/presentation/screens/review_order/widget/review_order_app_bar.dart b/concierge/lib/presentation/screens/review_order/widget/review_order_app_bar.dart
index 242a28bb..d80adf60 100644
--- a/concierge/lib/presentation/screens/review_order/widget/review_order_app_bar.dart
+++ b/concierge/lib/presentation/screens/review_order/widget/review_order_app_bar.dart
@@ -5,6 +5,8 @@ import 'package:concierge/presentation/theme/app_colors.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../provide_location/provide_location_route.dart';
+
class ReviewOrderAppBar extends StatelessWidget {
const ReviewOrderAppBar({super.key});
@@ -27,7 +29,15 @@ class ReviewOrderAppBar extends StatelessWidget {
WidgetState.any: AppColors.sandColor,
}),
),
- onPressed: cartCubit.products.isEmpty ? null : () => ConfirmOrderRoute().push(context),
+ onPressed: cartCubit.products.isEmpty
+ ? null
+ : () {
+ if (cartCubit.state.isDelivery) {
+ ProvideLocationRoute().push(context);
+ } else {
+ ConfirmOrderRoute().push(context);
+ }
+ },
child: Row(
children: [
Text(