diff --git a/lib/pages/ErService/rapid-response-team/rrt-place-order.dart b/lib/pages/ErService/rapid-response-team/rrt-place-order.dart index 9cded48d..c2d943ed 100644 --- a/lib/pages/ErService/rapid-response-team/rrt-place-order.dart +++ b/lib/pages/ErService/rapid-response-team/rrt-place-order.dart @@ -1,6 +1,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/rrt-view-model.dart'; import 'package:diplomaticquarterapp/models/rrt/service_price.dart'; +import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; @@ -175,9 +176,10 @@ class RRTPlaceOrderPage extends StatelessWidget{ message: localize.rrtOrderSuccessMessage, okText: localize.ok, okFunction: (){ - + AlertDialogBox.closeAlertDialog(_context); + gotoRRTRoot(); } - ).showAlertDialog(); + ).showAlertDialog(_context); } }else{ AppToast.showErrorToast(message: 'Invalid location selected'); @@ -186,6 +188,8 @@ class RRTPlaceOrderPage extends StatelessWidget{ } gotoRRTRoot(){ - + Navigator.pushAndRemoveUntil( + _context, + MaterialPageRoute(builder: (context) => ErOptions(isAppbar: true)), (Route r) => false); } } \ No newline at end of file diff --git a/lib/widgets/dialogs/alert_dialog.dart b/lib/widgets/dialogs/alert_dialog.dart index be202fd9..5e0bbb35 100644 --- a/lib/widgets/dialogs/alert_dialog.dart +++ b/lib/widgets/dialogs/alert_dialog.dart @@ -17,11 +17,10 @@ class AlertDialogBox { @required this.okText, @required this.okFunction}); - showAlertDialog({BuildContext context}) { + showAlertDialog(BuildContext context) { Widget continueButton = FlatButton(child: Text(this.okText), onPressed: (){ this.okFunction(); - closeAlertDialog(context); }); // set up the AlertDialog