Commit f245e356 authored by Dio Maulana's avatar Dio Maulana

viewbill new

parent 23a8182d
...@@ -13,6 +13,7 @@ import 'package:byod/models/member_info.dart'; ...@@ -13,6 +13,7 @@ import 'package:byod/models/member_info.dart';
import 'package:byod/models/payment_list.dart'; import 'package:byod/models/payment_list.dart';
import 'package:byod/models/voucher_list.dart'; import 'package:byod/models/voucher_list.dart';
import 'package:byod/ui/viewbill/view_bill.dart'; import 'package:byod/ui/viewbill/view_bill.dart';
import 'package:byod/ui/viewbill/view_bill_new.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
...@@ -1197,8 +1198,10 @@ class Api { ...@@ -1197,8 +1198,10 @@ class Api {
// MaterialPageRoute( // MaterialPageRoute(
// builder: (_) => FinishOrder(pinOrder: jsonObject['pin']))); // builder: (_) => FinishOrder(pinOrder: jsonObject['pin'])));
context.read<OrdersBloc>().clearOrder(); context.read<OrdersBloc>().clearOrder();
Navigator.pushAndRemoveUntil(context, Navigator.pushAndRemoveUntil(
MaterialPageRoute(builder: (_) => ViewBill()), (route) => false); context,
MaterialPageRoute(builder: (_) => const ViewBillNew()),
(route) => false);
} else if (jsonObject['code'] == 'ORDER_LOCK') { } else if (jsonObject['code'] == 'ORDER_LOCK') {
await EasyLoading.dismiss(); await EasyLoading.dismiss();
EasyLoading.showToast(jsonObject['msg']); EasyLoading.showToast(jsonObject['msg']);
...@@ -1434,7 +1437,7 @@ class Api { ...@@ -1434,7 +1437,7 @@ class Api {
await EasyLoading.dismiss(); await EasyLoading.dismiss();
Navigator.pushReplacement( Navigator.pushReplacement(
context, MaterialPageRoute(builder: (_) => ViewBill())); context, MaterialPageRoute(builder: (_) => const ViewBillNew()));
return 'OK'; return 'OK';
} else { } else {
await EasyLoading.dismiss(); await EasyLoading.dismiss();
......
...@@ -1127,8 +1127,8 @@ class _NewHome2State extends State<NewHome2> { ...@@ -1127,8 +1127,8 @@ class _NewHome2State extends State<NewHome2> {
onTap: () { onTap: () {
// Navigator.push( // Navigator.push(
// context, MaterialPageRoute(builder: (_) => ViewBill())); // context, MaterialPageRoute(builder: (_) => ViewBill()));
Navigator.push( Navigator.push(context,
context, MaterialPageRoute(builder: (_) => ViewBillNew())); MaterialPageRoute(builder: (_) => const ViewBillNew()));
}, },
child: const Image( child: const Image(
image: AssetImage('assets/icons/book.png'), image: AssetImage('assets/icons/book.png'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment